Merge branch 'v1.7'

Author: gadomski

CHANGELOG.md

@@ -24,6 +24,12 @@
 - Catalog `get_item()`. Use `get_items(id)` instead ([#1075](https://github.com/stac-utils/pystac/pull/1075))
 - Catalog and Collection `get_all_items`. Use `get_items(recursive=True)` instead ([#1075](https://github.com/stac-utils/pystac/pull/1075))
 
+## [v1.7.3]
+
+### Fixed
+
+- Duplicate `self` links in Items ([#1103](https://github.com/stac-utils/pystac/pull/1103))
+
 ## [v1.7.2]
 
 ### Fixed
@@ -698,7 +704,8 @@ use `Band.create`
 
 Initial release.
 
-[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.7.2..main>
+[Unreleased]: <https://github.com/stac-utils/pystac/compare/v1.7.3..main>
+[v1.7.3]: <https://github.com/stac-utils/pystac/compare/v1.7.2..v1.7.3>
 [v1.7.2]: <https://github.com/stac-utils/pystac/compare/v1.7.1..v1.7.2>
 [v1.7.1]: <https://github.com/stac-utils/pystac/compare/v1.7.0..v1.7.1>
 [v1.7.0]: <https://github.com/stac-utils/pystac/compare/v1.6.1..v1.7.0>

pystac/item.py

@@ -6,7 +6,7 @@
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, TypeVar, Union, cast
 
 import pystac
-from pystac import STACError, STACObjectType
+from pystac import RelType, STACError, STACObjectType
 from pystac.asset import Asset
 from pystac.catalog import Catalog
 from pystac.collection import Collection
@@ -473,13 +473,9 @@ def from_dict(
             assets={k: Asset.from_dict(v) for k, v in assets.items()},
         )
 
-        has_self_link = False
         for link in links:
-            has_self_link |= link["rel"] == pystac.RelType.SELF
-            item.add_link(Link.from_dict(link))
-
-        if not has_self_link and href is not None:
-            item.add_link(Link.self_href(href))
+            if href is None or link.get("rel", None) != RelType.SELF:
+                item.add_link(Link.from_dict(link))
 
         if root:
             item.set_root(root)

pystac/version.py

@@ -1,7 +1,7 @@
 import os
 from typing import Optional
 
-__version__ = "1.7.2"
+__version__ = "1.7.3"
 """Library version"""
 
 

tests/conftest.py

@@ -1,15 +1,14 @@
 # TODO move all test case code to this file
 
-from pathlib import Path
 from datetime import datetime
+from pathlib import Path
 
 import pytest
 
 from pystac import Catalog, Collection, Item
 
 from .utils import ARBITRARY_BBOX, ARBITRARY_EXTENT, ARBITRARY_GEOM, TestCases
 
-
 here = Path(__file__).resolve().parent
 
 
@@ -46,3 +45,8 @@ def projection_landsat8_item() -> Item:
 
 def get_data_file(rel_path: str) -> str:
     return str(here / "data-files" / rel_path)
+
+
+@pytest.fixture
+def sample_item() -> Item:
+    return Item.from_file(TestCases.get_path("data-files/item/sample-item.json"))

tests/test_item.py

@@ -5,6 +5,7 @@
 import tempfile
 import unittest
 from copy import deepcopy
+from pathlib import Path
 from typing import Any, Dict, Optional
 
 import dateutil.relativedelta
@@ -470,3 +471,12 @@ def test_geo_interface() -> None:
         item.to_dict(include_self_link=False, transform_hrefs=False)
         == item.__geo_interface__
     )
+
+
+def test_duplicate_self_links(tmp_path: Path, sample_item: pystac.Item) -> None:
+    # https://github.com/stac-utils/pystac/issues/1102
+    assert len(sample_item.get_links(rel="self")) == 1
+    path = tmp_path / "item.json"
+    sample_item.save_object(include_self_link=True, dest_href=str(path))
+    sample_item = Item.from_file(str(path))
+    assert len(sample_item.get_links(rel="self")) == 1