Skip to content

Make usage of raw bookmarks easier #1065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Make usage of raw bookmarks easier #1065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
414a0c8
Make usage of raw bookmarks easier
robsdedude Jun 14, 2024
e297f03
Merge branch '5.0' into fix/bookmarks-from-raw-values
robsdedude Jun 25, 2024
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
11 changes: 7 additions & 4 deletions src/neo4j/_async/bookmark_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,13 @@ def __init__(
if not initial_bookmarks:
self._bookmarks = set()
else:
self._bookmarks = set(getattr(
initial_bookmarks, "raw_values",
t.cast(t.Iterable[str], initial_bookmarks)
))
if not hasattr(initial_bookmarks, "raw_values"):
initial_bookmarks = Bookmarks.from_raw_values(
t.cast(t.Iterable[str], initial_bookmarks)
)
self._bookmarks = set(
t.cast(Bookmarks, initial_bookmarks).raw_values
)
self._lock = AsyncCooperativeLock()

async def update_bookmarks(
Expand Down
11 changes: 7 additions & 4 deletions src/neo4j/_sync/bookmark_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,13 @@ def __init__(
if not initial_bookmarks:
self._bookmarks = set()
else:
self._bookmarks = set(getattr(
initial_bookmarks, "raw_values",
t.cast(t.Iterable[str], initial_bookmarks)
))
if not hasattr(initial_bookmarks, "raw_values"):
initial_bookmarks = Bookmarks.from_raw_values(
t.cast(t.Iterable[str], initial_bookmarks)
)
self._bookmarks = set(
t.cast(Bookmarks, initial_bookmarks).raw_values
)
self._lock = CooperativeLock()

def update_bookmarks(
Expand Down
6 changes: 5 additions & 1 deletion src/neo4j/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,12 @@ def from_raw_values(cls, values: t.Iterable[str]) -> Bookmarks:
bookmarks.

:param values: ASCII string values (raw bookmarks)
:type values: Iterable[str]
"""
if isinstance(values, str):
# Unfortunately, str itself is an iterable of str, iterating
# over characters. Type checkers will not catch this, so we help
# the user out.
values = values,
obj = cls()
bookmarks = []
for value in values:
Expand Down