Skip to content

Changes the schema #27

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 4 commits into from
May 20, 2022
Merged

Changes the schema #27

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c295003
Changes the schema and fixes a bug
hbcarlos May 20, 2022
fa8fad9
Clean up
hbcarlos May 20, 2022
e29ac44
Review
hbcarlos May 20, 2022
148992c
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 20, 2022
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
44 changes: 33 additions & 11 deletions jupyter_ydoc/ydoc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,28 @@ def observe(self, callback):
class YNotebook(YBaseDoc):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._ycells = self._ydoc.get_array("cells")
self._ymeta = self._ydoc.get_map("meta")
self._ycells = self._ydoc.get_array("cells")
self._ymetadata = self._ydoc.get_map("metadata")

@property
def source(self):
cells = self._ycells.to_json()
meta = self._ymeta.to_json()
cast_all(cells, float, int)
cells = self._ycells.to_json()
metadata = self._ymetadata.to_json()
cast_all(meta, float, int)
cast_all(cells, float, int)
cast_all(metadata, float, int)
for cell in cells:
if "id" in cell and meta["nbformat"] == 4 and meta["nbformat_minor"] <= 4:
# strip cell IDs if we have notebook format 4.0-4.4
del cell["id"]
if cell["cell_type"] in ["raw", "markdown"] and not cell["attachments"]:
del cell["attachments"]

return dict(
cells=cells,
metadata=meta["metadata"],
metadata=metadata,
nbformat=int(meta["nbformat"]),
nbformat_minor=int(meta["nbformat_minor"]),
)
Expand All @@ -113,33 +119,49 @@ def source(self, value):
]
with self._ydoc.begin_transaction() as t:
# clear document
# TODO: use clear
Copy link
Collaborator

@davidbrochart davidbrochart May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover?

Copy link
Contributor Author

@hbcarlos hbcarlos May 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. In yjs, we have a clear function. Not sure if we will have the equivalent in ypy.

cells_len = len(self._ycells)
if cells_len:
self._ycells.delete_range(t, 0, cells_len)
for key in self._ymeta:
self._ymeta.pop(t, key)
if cells_len:
self._ycells.delete_range(t, 0, cells_len)
for key in self._ymetadata:
self._ymetadata.pop(t, key)
for key in [k for k in self._ystate if k != "dirty"]:
self._ystate.pop(t, key)

# initialize document
ycells = []
for cell in nb["cells"]:
cell["source"] = Y.YText(cell["source"])
if "id" not in cell:
cell["id"] = str(uuid4())
if "outputs" in cell:
cell["outputs"] = Y.YArray(cell["outputs"])
cell_type = cell["cell_type"]
cell["source"] = Y.YText(cell["source"])
metadata = {}
if "metadata" in cell:
metadata = cell["metadata"]
cell["metadata"] = Y.YMap(metadata)
if cell_type in ["raw", "markdown"]:
attachments = {}
if "attachments" in cell:
attachments = cell["attachments"]
cell["attachments"] = Y.YMap(attachments)
elif cell_type == "code":
outputs = cell.get("outputs", [])
cell["outputs"] = Y.YArray(outputs)
ycell = Y.YMap(cell)
ycells.append(ycell)

if ycells:
self._ycells.extend(t, ycells)
self._ymeta.set(t, "metadata", nb["metadata"])
for k, v in nb["metadata"].items():
self._ymetadata.set(t, k, v)
self._ymeta.set(t, "nbformat", nb["nbformat"])
self._ymeta.set(t, "nbformat_minor", nb["nbformat_minor"])

def observe(self, callback):
self.unobserve()
self._subscriptions[self._ystate] = self._ystate.observe(callback)
self._subscriptions[self._ycells] = self._ycells.observe_deep(callback)
self._subscriptions[self._ymeta] = self._ymeta.observe(callback)
self._subscriptions[self._ycells] = self._ycells.observe_deep(callback)
self._subscriptions[self._ymetadata] = self._ymetadata.observe(callback)