portolan-python 0.1.5__tar.gz → 0.1.7__tar.gz

{portolan_python-0.1.5 → portolan_python-0.1.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: portolan-python
-Version: 0.1.5
+Version: 0.1.7
 Summary: A lightweight Python implementation of the Portolan specification.
 Author: Portolan contributors
 License: Apache-2.0

{portolan_python-0.1.5 → portolan_python-0.1.7}/docs/distribution.md

@@ -8,8 +8,8 @@ preferred package index for published versions.
 Push a tag that matches the version in `pyproject.toml`:
 
 ```bash
-git tag v0.1.5
-git push origin v0.1.5
+git tag v0.1.7
+git push origin v0.1.7
 ```
 
 The release workflow runs the tests, builds both distributions, checks their
@@ -25,7 +25,7 @@ Install the wheel attached to a release:
 
 ```bash
 python -m pip install \
-  https://github.com/jemacchi/portolan-python/releases/download/v0.1.5/portolan_python-0.1.5-py3-none-any.whl
+  https://github.com/jemacchi/portolan-python/releases/download/v0.1.7/portolan_python-0.1.7-py3-none-any.whl
 ```
 
 This path needs no package index account.
@@ -35,7 +35,7 @@ This path needs no package index account.
 Install a published version from PyPI with:
 
 ```bash
-python -m pip install portolan-python==0.1.5
+python -m pip install portolan-python==0.1.7
 ```
 
 Omit the version constraint to install the latest published version.

{portolan_python-0.1.5 → portolan_python-0.1.7}/docs/examples.md

@@ -10,14 +10,14 @@ GitHub:
 
 ```bash
 python -m pip install \
-  https://github.com/jemacchi/portolan-python/releases/download/v0.1.5/portolan_python-0.1.5-py3-none-any.whl
+  https://github.com/jemacchi/portolan-python/releases/download/v0.1.7/portolan_python-0.1.7-py3-none-any.whl
 ```
 
 You can also install the source at a specific tag:
 
 ```bash
 python -m pip install \
-  "portolan-python @ git+https://github.com/jemacchi/portolan-python.git@v0.1.5"
+  "portolan-python @ git+https://github.com/jemacchi/portolan-python.git@v0.1.7"
 ```
 
 ## List collections and assets

{portolan_python-0.1.5 → portolan_python-0.1.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "portolan-python"
-version = "0.1.5"
+version = "0.1.7"
 description = "A lightweight Python implementation of the Portolan specification."
 readme = "README.md"
 requires-python = ">=3.10"

{portolan_python-0.1.5 → portolan_python-0.1.7}/src/portolan/registry.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import json
+import math
 import os
 import shutil
 import tempfile
@@ -31,6 +32,14 @@ class RegistryCatalogEntry:
     url: str
     title: str | None = None
     status: str | None = None
+    bbox: tuple[float, float, float, float] | None = None
+    licenses: tuple[str, ...] = ()
+    collection_count: int | None = None
+    feature_count: int | None = None
+    total_size_bytes: int | None = None
+    updated: str | None = None
+    logo_url: str | None = None
+    failure_reason: str | None = None
 
 
 def load_registry_entries(
@@ -58,12 +67,24 @@ def load_registry_entries(
         if catalog_ids is not None and registry_id not in catalog_ids:
             continue
         title = link.get("title")
+        licenses = link.get("portolan_registry:licenses")
+        logo = link.get("portolan_registry:logo")
         entries.append(
             RegistryCatalogEntry(
                 id=registry_id,
                 url=urljoin(registry_url, href),
                 title=title if isinstance(title, str) else None,
                 status=status if isinstance(status, str) else None,
+                bbox=_horizontal_bbox(link.get("bbox")),
+                licenses=tuple(sorted(key for key in licenses if isinstance(key, str)))
+                if isinstance(licenses, dict)
+                else (),
+                collection_count=_optional_int(link.get("portolan_registry:collection_count")),
+                feature_count=_optional_int(link.get("portolan_registry:feature_count")),
+                total_size_bytes=_optional_int(link.get("portolan_registry:total_size_bytes")),
+                updated=_optional_str(link.get("portolan_registry:updated")),
+                logo_url=_optional_str(logo.get("href")) if isinstance(logo, dict) else None,
+                failure_reason=_optional_str(link.get("portolan_registry:failure_reason")),
             )
         )
         if limit is not None and len(entries) >= limit:
@@ -71,6 +92,28 @@ def load_registry_entries(
     return entries
 
 
+def _optional_int(value: object) -> int | None:
+    return value if isinstance(value, int) and not isinstance(value, bool) else None
+
+
+def _optional_str(value: object) -> str | None:
+    return value if isinstance(value, str) and value else None
+
+
+def _horizontal_bbox(value: object) -> tuple[float, float, float, float] | None:
+    if not isinstance(value, (list, tuple)) or len(value) < 4 or len(value) % 2:
+        return None
+    if not all(
+        isinstance(coordinate, (int, float))
+        and not isinstance(coordinate, bool)
+        and math.isfinite(coordinate)
+        for coordinate in value
+    ):
+        return None
+    half = len(value) // 2
+    return (float(value[0]), float(value[1]), float(value[half]), float(value[half + 1]))
+
+
 def download_registry_catalog(
     catalog_url: str,
     output_dir: Path,
@@ -221,16 +264,27 @@ def _write_catalog_tree(
         rewritten_links: list[Any] = []
         for link in links:
             rewritten_link = link
-            if isinstance(link, dict) and link.get("rel") == "child":
-                href = link.get("href")
-                if isinstance(href, str):
-                    child_url = urljoin(document_url, href)
+            if isinstance(link, dict) and isinstance(link.get("href"), str):
+                href = link["href"]
+                linked_url = urljoin(document_url, href)
+                rewritten_link = {**link, "href": linked_url}
+                if link.get("rel") in {"root", "parent"}:
+                    linked_target = next(
+                        (path for path, owner_url in targets.items() if owner_url == linked_url),
+                        None,
+                    )
+                    if linked_target is not None:
+                        rewritten_link = {
+                            **link,
+                            "href": _relative_local_href(target, linked_target),
+                        }
+                if link.get("rel") == "child":
+                    child_url = linked_url
                     child_target = _target_document_path(root_url, child_url, output_root)
                     owner = targets.get(child_target)
                     if owner is not None and owner != child_url:
                         raise ValueError(
-                            "Registry documents map to the same local path: "
-                            f"{owner}, {child_url}"
+                            f"Registry documents map to the same local path: {owner}, {child_url}"
                         )
                     if child_url in visited:
                         if owner == child_url:

{portolan_python-0.1.5 → portolan_python-0.1.7}/tests/test_registry_api.py

@@ -40,8 +40,19 @@ def test_load_registry_entries_filters_to_valid_children() -> None:
                 "rel": "child",
                 "href": "https://example.test/a/catalog.json",
                 "title": "A",
+                "bbox": [-71.0, -35.0, -70.0, -34.0],
                 "portolan_registry:id": "catalog-a",
                 "portolan_registry:status": "valid",
+                "portolan_registry:licenses": {"ODbL-1.0": 2, "CC-BY-4.0": 1},
+                "portolan_registry:collection_count": 3,
+                "portolan_registry:feature_count": 42,
+                "portolan_registry:total_size_bytes": 2048,
+                "portolan_registry:updated": "2026-10-08T00:00:00Z",
+                "portolan_registry:logo": {
+                    "href": "https://example.test/a/logo.png",
+                    "type": "image/png",
+                },
+                "portolan_registry:failure_reason": None,
             },
             {
                 "rel": "child",
@@ -59,6 +70,48 @@ def test_load_registry_entries_filters_to_valid_children() -> None:
     assert [(entry.id, entry.url, entry.title, entry.status) for entry in entries] == [
         ("catalog-a", "https://example.test/a/catalog.json", "A", "valid")
     ]
+    assert entries[0].bbox == (-71.0, -35.0, -70.0, -34.0)
+    assert entries[0].licenses == ("CC-BY-4.0", "ODbL-1.0")
+    assert entries[0].collection_count == 3
+    assert entries[0].feature_count == 42
+    assert entries[0].total_size_bytes == 2048
+    assert entries[0].updated == "2026-10-08T00:00:00Z"
+    assert entries[0].logo_url == "https://example.test/a/logo.png"
+    assert entries[0].failure_reason is None
+
+
+def test_load_registry_entries_ignores_malformed_optional_metadata() -> None:
+    registry = {
+        "links": [
+            {
+                "rel": "child",
+                "href": "https://example.test/a/catalog.json",
+                "bbox": [True, -35.0, -70.0, -34.0],
+                "portolan_registry:id": "catalog-a",
+                "portolan_registry:status": "valid",
+                "portolan_registry:licenses": ["not", "a", "mapping"],
+                "portolan_registry:collection_count": True,
+                "portolan_registry:feature_count": "many",
+                "portolan_registry:total_size_bytes": 1.5,
+                "portolan_registry:updated": 7,
+                "portolan_registry:logo": {"href": 9},
+                "portolan_registry:failure_reason": [],
+            }
+        ]
+    }
+
+    (entry,) = load_registry_entries(
+        "https://registry.test/catalogs.json", fetch_json=lambda url: registry
+    )
+
+    assert entry.bbox is None
+    assert entry.licenses == ()
+    assert entry.collection_count is None
+    assert entry.feature_count is None
+    assert entry.total_size_bytes is None
+    assert entry.updated is None
+    assert entry.logo_url is None
+    assert entry.failure_reason is None
 
 
 def test_load_registry_entries_resolves_relative_child_urls() -> None:
@@ -234,6 +287,78 @@ def test_download_registry_catalog_rewrites_downloaded_children_to_local_hrefs(
     assert collection["links"] == [{"rel": "child", "href": "../catalog.json"}]
 
 
+def test_download_registry_catalog_makes_non_downloaded_relative_links_absolute(
+    tmp_path: Path,
+) -> None:
+    root_url = "https://example.test/demo/catalog.json"
+    collection_url = "https://example.test/demo/roads/collection.json"
+    feature_url = "https://example.test/demo/roads/features/road-1.json"
+    responses = {
+        root_url: {
+            "type": "Catalog",
+            "id": "demo",
+            "links": [{"rel": "child", "href": "./roads/collection.json"}],
+        },
+        collection_url: {
+            **_collection("roads", {}),
+            "links": [
+                {"rel": "item", "href": "./items/road-1.json"},
+                {"rel": "child", "href": "./features/road-1.json"},
+            ],
+        },
+        feature_url: {"type": "Feature", "id": "road-1"},
+    }
+
+    catalog_root = download_registry_catalog(
+        root_url,
+        tmp_path,
+        fetch_json=lambda url: responses[url],
+    )
+
+    collection = json.loads(
+        (catalog_root / "roads" / "collection.json").read_text(encoding="utf-8")
+    )
+    assert collection["links"] == [
+        {"rel": "item", "href": "https://example.test/demo/roads/items/road-1.json"},
+        {"rel": "child", "href": feature_url},
+    ]
+
+
+def test_download_registry_catalog_keeps_downloaded_root_and_parent_links_local(
+    tmp_path: Path,
+) -> None:
+    root_url = "https://example.test/demo/catalog.json"
+    collection_url = "https://example.test/demo/roads/collection.json"
+    responses = {
+        root_url: {
+            "type": "Catalog",
+            "id": "demo",
+            "links": [{"rel": "child", "href": "./roads/collection.json"}],
+        },
+        collection_url: {
+            **_collection("roads", {}),
+            "links": [
+                {"rel": "root", "href": root_url},
+                {"rel": "parent", "href": root_url},
+            ],
+        },
+    }
+
+    catalog_root = download_registry_catalog(
+        root_url,
+        tmp_path,
+        fetch_json=lambda url: responses[url],
+    )
+
+    collection = json.loads(
+        (catalog_root / "roads" / "collection.json").read_text(encoding="utf-8")
+    )
+    assert collection["links"] == [
+        {"rel": "root", "href": "../catalog.json"},
+        {"rel": "parent", "href": "../catalog.json"},
+    ]
+
+
 def test_download_registry_catalog_skips_child_cycles(tmp_path: Path) -> None:
     root_url = "https://example.test/demo/catalog.json"
     child_url = "https://example.test/demo/roads/collection.json"

{portolan_python-0.1.5 → portolan_python-0.1.7}/uv.lock

@@ -468,7 +468,7 @@ wheels = [
 
 [[package]]
 name = "portolan-python"
-version = "0.1.5"
+version = "0.1.7"
 source = { editable = "." }
 
 [package.optional-dependencies]