Merge branch 'infra1338-resilient-derived-from-parsing'

Author: soxofaan

CHANGELOG.md

@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Convert setup.py to pyproject.toml ([#920](https://github.com/Open-EO/openeo-python-client/issues/920))
+- Make `_DerivedFrom._from_url` more resilient against unresolvable/unparsable `derived_from` links ([#928](https://github.com/Open-EO/openeo-python-client/issues/928), eu-cdse/openeo-cdse-infra#1338)
 
 ### Removed
 

openeo/_version.py

@@ -1 +1 @@
-__version__ = "0.53.0a1"
+__version__ = "0.53.0a2"

openeo/testing/results.py

@@ -540,10 +540,15 @@ def _from_href(self, href: str, base: Union[str, Path, None] = None) -> Iterable
             return [_ProductRef(item_id=self._normalize_legacy_derived_from(href))]
 
     def _from_url(self, url: str) -> Iterable[_ProductRef]:
-        resp = self._request_session.get(url)
-        resp.raise_for_status()
-        doc = resp.json()
-        return self._from_json_document(doc=doc, doc_ref=url)
+        try:
+            resp = self._request_session.get(url)
+            resp.raise_for_status()
+            doc = resp.json()
+            return self._from_json_document(doc=doc, doc_ref=url)
+        except Exception as e:
+            _log.warning(f"Failed to get/parse 'derived_from' document {url=}: {e=}")
+            # Handle URL as id
+            return [_ProductRef(item_id=url)]
 
     def _from_path(self, path: Union[str, Path]) -> Iterable[_ProductRef]:
         with open(path) as f:

tests/testing/test_results.py

@@ -788,6 +788,41 @@ def test_from_links_legacy(self):
             _ProductRef(item_id="NDVI300_20250927_V3"),
         }
 
+    def test_from_links_legacy_unresolvable_url(self, requests_mock, caplog):
+        """
+        Legacy derived_from link: href is an URL, but not expected to be resolvable
+        (e.g. it is internal or requires auth)
+        """
+        href = "https://internal.test/item"
+        requests_mock.get(href, status_code=401)
+        links = [
+            {"rel": "derived_from", "href": href},
+        ]
+        derived_from = set(_DerivedFrom().from_links(links))
+        assert derived_from == {
+            _ProductRef(item_id="https://internal.test/item"),
+        }
+        assert caplog.messages == [
+            dirty_equals.IsStr(regex=".*Failed to.*parse.*HTTPError.*401 Client Error.*"),
+        ]
+
+    def test_from_links_legacy_no_json_doc(self, requests_mock, caplog):
+        """
+        Legacy derived_from link: href is an URL, but not a JSON document
+        """
+        href = "https://internal.test/item"
+        requests_mock.get(href, text="look ma no JSON!")
+        links = [
+            {"rel": "derived_from", "href": href},
+        ]
+        derived_from = set(_DerivedFrom().from_links(links))
+        assert derived_from == {
+            _ProductRef(item_id="https://internal.test/item"),
+        }
+        assert caplog.messages == [
+            dirty_equals.IsStr(regex=".*Failed to.*parse.*JSONDecodeError.*"),
+        ]
+
     @pytest.fixture()
     def item_collection_doc(self):
         return {