Skip to content

Commit ab6e55d

Browse files
committed
Bump pycrdt-v0.8.30
1 parent 8dc84c2 commit ab6e55d

File tree

4 files changed

+24
-137
lines changed

4 files changed

+24
-137
lines changed

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ keywords = [
1919
]
2020
dependencies = [
2121
"comm >=0.1.4,<1",
22-
"pycrdt >=0.8.2,<0.9.0",
22+
"pycrdt >=0.8.30,<0.9.0",
2323
"declare >=1.0.1,<2.0.0",
2424
]
2525

tests/conftest.py

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44

55
import comm
66
import pytest
7-
from pycrdt import TransactionEvent
7+
from pycrdt import (
8+
YMessageType,
9+
YSyncMessageType,
10+
TransactionEvent,
11+
create_sync_message,
12+
create_update_message,
13+
handle_sync_message,
14+
)
815
from ypywidgets import Widget
916
from ypywidgets.comm import CommWidget
10-
from ypywidgets.utils import YMessageType, YSyncMessageType, create_update_message, process_sync_message, sync
1117

1218

1319
class MockComm(comm.base_comm.BaseComm):
@@ -73,13 +79,13 @@ async def receive(self):
7379
msg_type, data, metadata, buffers, target_name, target_module = await self.comm.send_queue.get()
7480
if msg_type == "comm_open":
7581
self.widget = self.widget_factory()
76-
msg = sync(self.widget.ydoc)
77-
self.comm.handle_msg(msg)
82+
msg = create_sync_message(self.widget.ydoc)
83+
self.comm.handle_msg({"buffers": [msg]})
7884
elif msg_type == "comm_msg":
7985
message = buffers[0]
8086
if message[0] == YMessageType.SYNC:
81-
reply = process_sync_message(message[1:], self.widget.ydoc)
82-
if reply:
87+
reply = handle_sync_message(message[1:], self.widget.ydoc)
88+
if reply is not None:
8389
self.comm.handle_msg({"buffers": [reply]})
8490
if message[1] == YSyncMessageType.SYNC_STEP2:
8591
self.widget.ydoc.observe(self.send)

ypywidgets/comm.py

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
from __future__ import annotations
22

33
import comm
4-
from pycrdt import Doc, Text, TransactionEvent
5-
6-
from .utils import (
4+
from pycrdt import (
5+
Doc,
6+
Text,
7+
TransactionEvent,
78
YMessageType,
89
YSyncMessageType,
10+
create_sync_message,
911
create_update_message,
10-
process_sync_message,
11-
sync,
12+
handle_sync_message,
1213
)
14+
1315
from .widget import Widget
1416

1517

@@ -35,15 +37,15 @@ def __init__(
3537
) -> None:
3638
self._ydoc = ydoc
3739
self._comm = comm
38-
msg = sync(ydoc)
39-
self._comm.send(**msg)
40+
msg = create_sync_message(ydoc)
41+
self._comm.send(buffers=[msg])
4042
self._comm.on_msg(self._receive)
4143

4244
def _receive(self, msg):
4345
message = bytes(msg["buffers"][0])
4446
if message[0] == YMessageType.SYNC:
45-
reply = process_sync_message(message[1:], self._ydoc)
46-
if reply:
47+
reply = handle_sync_message(message[1:], self._ydoc)
48+
if reply is not None:
4749
self._comm.send(buffers=[reply])
4850
if message[1] == YSyncMessageType.SYNC_STEP2:
4951
self._ydoc.observe(self._send)

ypywidgets/utils.py

-121
This file was deleted.

0 commit comments

Comments
 (0)