Mount nodes hotfix (#971)

* REF: Reuse existing fixture.

* Test mount_node against PG as well.

* Fix mount_nodes on PG

* Update CHANGELOG

* Type hint; move validation; refactor logic for safety.

Author: danielballan

CHANGELOG.md

@@ -12,6 +12,12 @@ Write the date in place of the "Unreleased" in the case a new version is release
   client via a new keyword-only argument `drop_revision` in
   `update_metadata`, `patch_metadata`, and `replace_metadata`.
 
+### Fixed
+
+- A critical bug in the `mount_node` feature introduced in the
+  previous release prohibited the server from starting when
+  `mount_node` was used with a PostgreSQL database.
+
 ## 0.1.0-b25 (2025-05-06)
 
 ### Added

tiled/_tests/adapters/test_sql.py

@@ -1,21 +1,17 @@
-import os
 from pathlib import Path
-from typing import Any, AsyncGenerator, Callable, Generator, Union
+from typing import Any, Callable, Generator, Union
 
 import adbc_driver_duckdb
 import adbc_driver_sqlite
 import pyarrow as pa
 import pytest
-import pytest_asyncio
 
 from tiled.adapters.sql import SQLAdapter, check_table_name
 from tiled.storage import parse_storage, register_storage
 from tiled.structures.core import StructureFamily
 from tiled.structures.data_source import DataSource, Management
 from tiled.structures.table import TableStructure
 
-from ..utils import temp_postgres
-
 names = ["f0", "f1", "f2", "f3"]
 data0 = [
     pa.array([1, 2, 3, 4, 5]),
@@ -157,22 +153,12 @@ def test_attributes_sql_many_part(adapter_sql_many_partition: SQLAdapter) -> Non
     )
 
 
-@pytest_asyncio.fixture
-async def postgres_uri() -> AsyncGenerator[str, None]:
-    uri = os.getenv("TILED_TEST_POSTGRESQL_URI")
-    if uri is None:
-        pytest.skip("TILED_TEST_POSTGRESQL_URI is not set")
-
-    async with temp_postgres(uri) as uri_with_database_name:
-        yield uri_with_database_name
-
-
 @pytest.fixture
 def adapter_psql_one_partition(
     data_source_from_init_storage: Callable[[str, int], DataSource[TableStructure]],
-    postgres_uri: str,
+    postgresql_database_uri: str,
 ) -> Generator[SQLAdapter, None, None]:
-    data_source = data_source_from_init_storage(postgres_uri, 1)
+    data_source = data_source_from_init_storage(postgresql_database_uri, 1)
     adapter = SQLAdapter(
         data_source.assets[0].data_uri,
         data_source.structure,
@@ -186,9 +172,9 @@ def adapter_psql_one_partition(
 @pytest.fixture
 def adapter_psql_many_partition(
     data_source_from_init_storage: Callable[[str, int], DataSource[TableStructure]],
-    postgres_uri: str,
+    postgresql_database_uri: str,
 ) -> SQLAdapter:
-    data_source = data_source_from_init_storage(postgres_uri, 3)
+    data_source = data_source_from_init_storage(postgresql_database_uri, 3)
     return SQLAdapter(
         data_source.assets[0].data_uri,
         data_source.structure,

tiled/_tests/test_mount_node.py

@@ -4,16 +4,15 @@
 from tiled.server.app import build_app_from_config
 
 
-def test_mount_node(tmpdir):
+def test_mount_node(sqlite_or_postgresql_database_uri, tmpdir):
     "Test 'mounting' sub-trees of a catalog."
-    catalog_uri = f"sqlite:///{tmpdir}/catalog.db"
     one_tree_config = {
         "trees": [
             {
                 "path": "/",
                 "tree": "catalog",
                 "args": {
-                    "uri": catalog_uri,
+                    "uri": sqlite_or_postgresql_database_uri,
                     "init_if_not_exists": True,
                     "writable_storage": [tmpdir / "data"],
                 },
@@ -35,7 +34,7 @@ def test_mount_node(tmpdir):
                 "path": "/a",
                 "tree": "catalog",
                 "args": {
-                    "uri": catalog_uri,
+                    "uri": sqlite_or_postgresql_database_uri,
                     "writable_storage": [tmpdir / "data"],
                     "mount_node": "/A",
                 },
@@ -44,7 +43,7 @@ def test_mount_node(tmpdir):
                 "path": "/b",
                 "tree": "catalog",
                 "args": {
-                    "uri": catalog_uri,
+                    "uri": sqlite_or_postgresql_database_uri,
                     "writable_storage": [tmpdir / "data"],
                     "mount_node": "/B",
                 },
@@ -80,7 +79,7 @@ def test_mount_node(tmpdir):
                 "path": "/some/nested/path",
                 "tree": "catalog",
                 "args": {
-                    "uri": catalog_uri,
+                    "uri": sqlite_or_postgresql_database_uri,
                     "writable_storage": [tmpdir / "data"],
                     "mount_node": "/A/x",
                 },
@@ -98,7 +97,7 @@ def test_mount_node(tmpdir):
                 "path": "/some/nested/path",
                 "tree": "catalog",
                 "args": {
-                    "uri": catalog_uri,
+                    "uri": sqlite_or_postgresql_database_uri,
                     "writable_storage": [tmpdir / "data"],
                     "mount_node": ["A", "x"],
                 },

tiled/catalog/adapter.py

@@ -1,4 +1,3 @@
-import asyncio
 import collections
 import copy
 import dataclasses
@@ -13,7 +12,7 @@
 import uuid
 from functools import partial, reduce
 from pathlib import Path
-from typing import Callable, Dict
+from typing import Callable, Dict, List, Optional, Union
 from urllib.parse import urlparse
 
 import anyio
@@ -308,9 +307,18 @@ def __init__(
         queries=None,
         sorting=None,
         access_policy=None,
+        mount_node: Optional[Union[str, List[str]]] = None,
     ):
         self.context = context
         self.engine = self.context.engine
+        if isinstance(mount_node, str):
+            mount_node = [segment for segment in mount_node.split("/") if segment]
+        if mount_node:
+            if not isinstance(node, RootNode):
+                # sanity-check -- this should not be reachable
+                raise RuntimeError("mount_node should only be passed with the RootNode")
+            node.ancestors.extend(mount_node[:-1])
+            node.key = mount_node[-1]
         self.node = node
         if node.key is None:
             # Special case for RootNode
@@ -1484,7 +1492,7 @@ def from_uri(
     init_if_not_exists=False,
     echo=DEFAULT_ECHO,
     adapters_by_mimetype=None,
-    mount_node=None,
+    mount_node: Optional[Union[str, List[str]]] = None,
 ):
     uri = ensure_specified_sql_driver(uri)
     if init_if_not_exists:
@@ -1528,15 +1536,8 @@ def from_uri(
         Context(engine, writable_storage, readable_storage, adapters_by_mimetype),
         RootNode(metadata, specs, access_policy),
         access_policy=access_policy,
+        mount_node=mount_node,
     )
-    if isinstance(mount_node, str):
-        mount_node = [segment for segment in mount_node.split("/") if segment]
-    if mount_node:
-
-        async def get_nested_node():
-            return await adapter.lookup_adapter(mount_node)
-
-        adapter = asyncio.run(get_nested_node())
     return adapter