Fix indexing on results after aookyying a search query

bluesky · Oct 23, 2023 · 8cf9556 · 8cf9556
1 parent 98dda33
commit 8cf9556
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/tiled/server/core.py b/tiled/server/core.py
@@ -103,7 +103,7 @@ def pagination_links(base_url, route, path_parts, offset, limit, length_hint):
     return links
 
 
-def apply_search(tree, filters, query_registry):
+async def apply_search(tree, filters, query_registry):
     queries = defaultdict(
         dict
     )  # e.g. {"text": {"text": "dog"}, "lookup": {"key": "..."}}
@@ -146,10 +146,19 @@ def apply_search(tree, filters, query_registry):
             # Two non-equal KeyLookup queries must return no results.
             tree = MapAdapter({})
         else:
-            try:
-                tree = MapAdapter({key_lookup: tree[key_lookup]}, must_revalidate=False)
-            except KeyError:
-                tree = MapAdapter({})
+            if hasattr(tree, "lookup_adapter"):
+                entry = await tree.lookup_adapter([key_lookup])
+                if entry is None:
+                    tree = MapAdapter({})
+                else:
+                    tree = MapAdapter({key_lookup: entry}, must_revalidate=False)
+            else:
+                try:
+                    tree = MapAdapter(
+                        {key_lookup: tree[key_lookup]}, must_revalidate=False
+                    )
+                except KeyError:
+                    tree = MapAdapter({})
 
     return tree
 
@@ -191,7 +200,7 @@ async def construct_entries_response(
     max_depth,
 ):
     path_parts = [segment for segment in path.split("/") if segment]
-    tree = apply_search(tree, filters, query_registry)
+    tree = await apply_search(tree, filters, query_registry)
     tree = apply_sort(tree, sort)
 
     count = await len_or_approx(tree)

diff --git a/tiled/server/router.py b/tiled/server/router.py
@@ -214,7 +214,7 @@ async def distinct(
     **filters,
 ):
     if hasattr(entry, "get_distinct"):
-        filtered = apply_search(entry, filters, query_registry)
+        filtered = await apply_search(entry, filters, query_registry)
         distinct = await ensure_awaitable(
             filtered.get_distinct, metadata, structure_families, specs, counts
         )