Merge pull request #870 from danielballan/avoid-sqlalchemy-dep

Avoid sqlalchemy dep

Author: genematx

bluesky-tiled-plugins/bluesky_tiled_plugins/catalog_of_bluesky_runs.py

@@ -3,8 +3,8 @@
 import functools
 import numbers
 import operator
+from typing import Any
 
-from tiled.adapters.utils import IndexCallable
 from tiled.client.container import Container
 from tiled.client.utils import handle_error
 from tiled.queries import Comparison, Eq, Like
@@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):
 
     def __repr__(self):
         # This is a copy/paste of the general-purpose implementation
-        # tiled.adapters.utils.tree_repr
+        # tiled.utils.node_repr
         # with some modifications to extract scan_id from the metadata.
         sample = self.items()[:10]
         # Use scan_id (int) if defined; otherwise fall back to uid.
@@ -209,3 +209,28 @@ def post_document(self, name, doc):
         link = self.item["links"]["self"].replace("/metadata", "/documents", 1)
         response = self.context.http_client.post(link, content=safe_json_dump({"name": name, "doc": doc}))
         handle_error(response)
+
+
+class IndexCallable:
+    """
+    DEPRECATED and no longer used internally
+
+    Provide getitem syntax for functions
+
+    >>> def inc(x):
+    ...     return x + 1
+
+    >>> I = IndexCallable(inc)
+    >>> I[3]
+    4
+
+    Vendored from dask
+    """
+
+    __slots__ = ("fn",)
+
+    def __init__(self, fn: Any) -> None:
+        self.fn = fn
+
+    def __getitem__(self, key: str) -> Any:
+        return self.fn(key)

databroker/mongo_normalized.py

@@ -36,12 +36,8 @@
 from tiled.iterviews import KeysView, ItemsView, ValuesView
 from tiled.query_registration import QueryTranslationRegistry
 from tiled.queries import AccessBlobFilter, Contains, Comparison, Eq, FullText, In, NotEq, NotIn, Regex
-from tiled.adapters.utils import (
-    tree_repr,
-    IndexersMixin,
-)
 from tiled.structures.core import Spec, StructureFamily
-from tiled.utils import import_object, OneShotCachedMap, UNCHANGED
+from tiled.utils import UNCHANGED, IndexersMixin, OneShotCachedMap, import_object, node_repr
 
 from .query_impl import (
     BlueskyMapAdapter,
@@ -1470,7 +1466,7 @@ def __repr__(self):
         # Display up to the first N keys to avoid making a giant service
         # request. Use _keys_slicer because it is unauthenticated.
         N = 10
-        return tree_repr(self, self._keys_slice(0, N, direction=1))
+        return node_repr(self, self._keys_slice(0, N, direction=1))
 
     def _get_run(self, run_start_doc):
         "Get a BlueskyRun, either from a cache or by making one if needed."