Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions bluesky-tiled-plugins/bluesky_tiled_plugins/_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@
# resulting in an unnecessary network hit just to raise
# AttributeError.

IPYTHON_METHODS = {
"_ipython_canary_method_should_not_exist_",
"_repr_mimebundle_"
"_ipython_display_"
}
IPYTHON_METHODS = {"_ipython_canary_method_should_not_exist_", "_repr_mimebundle__ipython_display_"}
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import keyword
import warnings
from collections import defaultdict
from typing import Optional

import numpy
import xarray
Expand Down Expand Up @@ -234,10 +235,10 @@ def __init__(self, client, keys=None):
def __repr__(self):
return node_repr(self, self._keys).replace(type(self).__name__, "DatasetClient")

def _keys_slice(self, start, stop, direction, _ignore_inlined_contents=False):
def _keys_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
yield from self._keys[start : stop : -1 if direction < 0 else 1] # noqa: #203

def _items_slice(self, start, stop, direction, _ignore_inlined_contents=False):
def _items_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
for key in self._keys[start : stop : -1 if direction < 0 else 1]: # noqa: #203
yield key, self[key]

Expand Down
5 changes: 3 additions & 2 deletions bluesky-tiled-plugins/bluesky_tiled_plugins/bluesky_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import keyword
import warnings
from datetime import datetime
from typing import Optional

from tiled.client.container import Container
from tiled.client.utils import handle_error
Expand Down Expand Up @@ -232,11 +233,11 @@ def documents(self, fill=False):


class BlueskyRunV2SQL(BlueskyRunV2, _BlueskyRunSQL):
def _keys_slice(self, start, stop, direction, **kwargs):
def _keys_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
keys = reversed(self._stream_names) if direction < 0 else self._stream_names
return (yield from keys[start:stop])

def _items_slice(self, start, stop, direction, **kwargs):
def _items_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
_streams_node = super().get("streams", {})
for key in reversed(self._stream_names) if direction < 0 else self._stream_names:
yield key, _streams_node.get(key)
Expand Down
5 changes: 3 additions & 2 deletions databroker/mongo_normalized.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import toolz.itertoolz
import xarray
from event_model import DocumentNames, schema_validators
from typing import Optional
from tiled.adapters.array import ArrayAdapter
from tiled.adapters.xarray import DatasetAdapter
from tiled.structures.array import (
Expand Down Expand Up @@ -1789,7 +1790,7 @@ def values(self):
def items(self):
return ItemsView(lambda: len(self), self._items_slice)

def _keys_slice(self, start, stop, direction):
def _keys_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
assert direction == 1, "direction=-1 should be handled by the client"
skip = start or 0
if stop is not None:
Expand All @@ -1805,7 +1806,7 @@ def _keys_slice(self, start, stop, direction):
# TODO Fetch just the uid.
yield run_start_doc["uid"]

def _items_slice(self, start, stop, direction):
def _items_slice(self, start, stop, direction, page_size: Optional[int] = None, **kwargs):
assert direction == 1, "direction=-1 should be handled by the client"
skip = start or 0
if stop is not None:
Expand Down
Loading