Skip to content

A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.

internal: pass around single bytes of message for KernelMessage (#6380)

Myles Scolnickd8b2bb88168d
diff --git a/marimo/_messaging/ops.py b/marimo/_messaging/ops.py
index d6014396b9..a9e4bb1a88 100644
--- a/marimo/_messaging/ops.py
+++ b/marimo/_messaging/ops.py
@@ -43,7 +43,7 @@ from marimo._messaging.errors import (
from marimo._messaging.mimetypes import KnownMimeType
from marimo._messaging.msgspec_encoder import encode_json_bytes
from marimo._messaging.streams import output_max_bytes
-from marimo._messaging.types import Stream
+from marimo._messaging.types import KernelMessage, Stream
from marimo._messaging.variables import get_variable_preview
from marimo._output.hypertext import Html
from marimo._plugins.core.web_component import JSONType
@@ -59,6 +59,32 @@ from marimo._utils.platform import is_pyodide, is_windows
LOGGER = loggers.marimo_logger()
+def serialize_kernel_message(message: Op) -> KernelMessage:
+ """
+ Serialize a MessageOperation to a KernelMessage.
+ """
+ return KernelMessage(encode_json_bytes(message))
+
+
+def deserialize_kernel_message(message: KernelMessage) -> MessageOperation:
+ """
+ Deserialize a KernelMessage to a MessageOperation.
+ """
+ return msgspec.json.decode(message, strict=True, type=MessageOperation) # type: ignore[no-any-return]
+
+
+class _OpName(msgspec.Struct):
+ op: str
+
+
+def deserialize_kernel_operation_name(message: KernelMessage) -> str:
+ """
+ Deserialize a KernelMessage to a MessageOperation name.
+ """
+ # We use the Op type to deserialize the message because it is slimmer than MessageOperation
+ return msgspec.json.decode(message, strict=True, type=_OpName).op
+
+
class Op(msgspec.Struct, tag_field="op"):
name: ClassVar[str]
@@ -73,7 +99,7 @@ class Op(msgspec.Struct, tag_field="op"):
stream = ctx.stream
try:
- stream.write(op=self.name, data=self.serialize())
+ stream.write(serialize_kernel_message(self))
except Exception as e:
LOGGER.exception(
"Error serializing op %s: %s",
@@ -82,9 +108,6 @@ class Op(msgspec.Struct, tag_field="op"):
)
return
- def serialize(self) -> bytes:
- return encode_json_bytes(self)
-
class CellOp(Op, tag="cell-op"):
"""Op to transition a cell.
@@ -322,16 +345,16 @@ class FunctionCallResult(Op, tag="function-call-result"):
return_value: JSONType
status: HumanReadableStatus
- def serialize(self) -> bytes:
+ def serialize(self) -> KernelMessage:
try:
- return encode_json_bytes(self)
+ return serialize_kernel_message(self)
except Exception as e:
LOGGER.exception(
"Error serializing function call result %s: %s",
self.__class__.__name__,
e,
)
- return encode_json_bytes(
+ return serialize_kernel_message(
FunctionCallResult(
function_call_id=self.function_call_id,
return_value=None,
diff --git a/marimo/_messaging/streams.py b/marimo/_messaging/streams.py
index c06c2328d4..a027ff5841 100644
--- a/marimo/_messaging/streams.py
+++ b/marimo/_messaging/streams.py
@@ -9,7 +9,6 @@ import threading
from collections import deque
from typing import (
TYPE_CHECKING,
- Any,
Optional,
Protocol,
)
@@ -73,7 +72,7 @@ def std_stream_max_bytes() -> int:
class PipeProtocol(Protocol):
- def send(self, obj: Any) -> None:
+ def send(self, obj: KernelMessage) -> None:
pass
@@ -81,7 +80,7 @@ class QueuePipe:
def __init__(self, queue: QueueType[KernelMessage]):
self._queue = queue
- def send(self, obj: Any) -> None:
+ def send(self, obj: KernelMessage) -> None:
self._queue.put_nowait(obj)
@@ -118,14 +117,22 @@ class ThreadSafeStream(Stream):
# stdin messages are pulled from this queue
self.input_queue = input_queue
- def write(self, op: str, data: bytes) -> None:
+ def write(self, data: KernelMessage) -> None:
with self.stream_lock:
try:
- self.pipe.send((op, data))
+ self.pipe.send(data)
except OSError as e:
+ from marimo._messaging.ops import (
+ deserialize_kernel_operation_name,
+ )
+
# Most likely a BrokenPipeError, caused by the
# server process shutting down
- LOGGER.debug("Error when writing (op: %s) to pipe: %s", op, e)
+ LOGGER.debug(
+ "Error when writing (op: %s) to pipe: %s",
+ deserialize_kernel_operation_name(data),
+ e,
+ )
def stop(self) -> None:
"""Teardown resources created by the stream."""
diff --git a/marimo/_messaging/types.py b/marimo/_messaging/types.py
index 4481fa7665..bc91a89afa 100644
--- a/marimo/_messaging/types.py
+++ b/marimo/_messaging/types.py
@@ -3,14 +3,13 @@ from __future__ import annotations
import abc
import io
-from typing import Optional
+from typing import NewType, Optional
from marimo._messaging.mimetypes import ConsoleMimeType
from marimo._types.ids import CellId_t
-# The message from the kernel is a tuple of message type
-# and a json representation of the message
-KernelMessage = tuple[str, bytes]
+# A KernelMessage is a bytes object that contains a serialized MessageOperation.
+KernelMessage = NewType("KernelMessage", bytes)
class Stream(abc.ABC):
@@ -23,7 +22,7 @@ class Stream(abc.ABC):
cell_id: Optional[CellId_t] = None
@abc.abstractmethod
- def write(self, op: str, data: bytes) -> None:
+ def write(self, data: KernelMessage) -> None:
pass
def stop(self) -> None:
@@ -32,7 +31,7 @@ class Stream(abc.ABC):
class NoopStream(Stream):
- def write(self, op: str, data: bytes) -> None:
+ def write(self, data: KernelMessage) -> None:
pass
diff --git a/marimo/_pyodide/bootstrap.py b/marimo/_pyodide/bootstrap.py
index 2582308b6e..8cca9f7323 100644
--- a/marimo/_pyodide/bootstrap.py
+++ b/marimo/_pyodide/bootstrap.py
@@ -5,8 +5,12 @@ import json
from typing import TYPE_CHECKING, Callable
from marimo._config.config import merge_config
-from marimo._messaging.msgspec_encoder import encode_json_bytes
-from marimo._messaging.ops import KernelCapabilities, KernelReady
+from marimo._messaging.ops import (
+ KernelCapabilities,
+ KernelReady,
+ deserialize_kernel_message,
+ serialize_kernel_message,
+)
from marimo._runtime.requests import (
AppMetadata,
CreationRequest,
@@ -78,8 +82,9 @@ def create_session(
"""
def write_kernel_message(op: KernelMessage) -> None:
- op_name, data_bytes = op
- text = f'{{"op": "{op_name}", "data": {data_bytes.decode("utf-8")}}}'
+ data_json_str = op.decode("utf-8")
+ op_name = deserialize_kernel_message(op).name
+ text = f'{{"op": "{op_name}", "data": {data_json_str}}}'
message_callback(text)
# Lazy import to decrease startup time
@@ -104,25 +109,22 @@ def create_session(
# We want this message to be performant, so any expensive operations
# should be after this message is sent
write_kernel_message(
- (
- KernelReady.name,
- encode_json_bytes(
- KernelReady(
- codes=tuple(app.cell_manager.codes()),
- names=tuple(app.cell_manager.names()),
- configs=tuple(app.cell_manager.configs()),
- cell_ids=tuple(app.cell_manager.cell_ids()),
- layout=app_file_manager.read_layout_config(),
- resumed=False,
- ui_values={},
- last_executed_code={},
- last_execution_time={},
- app_config=app.config,
- kiosk=False,
- capabilities=KernelCapabilities(),
- )
- ),
- )
+ serialize_kernel_message(
+ KernelReady(
+ codes=tuple(app.cell_manager.codes()),
+ names=tuple(app.cell_manager.names()),
+ configs=tuple(app.cell_manager.configs()),
+ cell_ids=tuple(app.cell_manager.cell_ids()),
+ layout=app_file_manager.read_layout_config(),
+ resumed=False,
+ ui_values={},
+ last_executed_code={},
+ last_execution_time={},
+ app_config=app.config,
+ kiosk=False,
+ capabilities=KernelCapabilities(),
+ )
+ ),
)
from marimo._pyodide.pyodide_session import PyodideBridge, PyodideSession
diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.py
index 11d40fb015..dc16f8142a 100644
--- a/marimo/_pyodide/pyodide_session.py
+++ b/marimo/_pyodide/pyodide_session.py
@@ -127,7 +127,7 @@ class PyodideSession:
self.consumers: list[Callable[[KernelMessage], None]] = [
lambda msg: self.session_consumer(msg),
- lambda msg: self.session_view.add_raw_operation(msg[1]),
+ lambda msg: self.session_view.add_raw_operation(msg),
]
def _on_message(self, msg: KernelMessage) -> None:
diff --git a/marimo/_pyodide/streams.py b/marimo/_pyodide/streams.py
index 0b96de954a..c3d125afe5 100644
--- a/marimo/_pyodide/streams.py
+++ b/marimo/_pyodide/streams.py
@@ -38,8 +38,8 @@ class PyodideStream(Stream):
self.cell_id = cell_id
self.input_queue = input_queue
- def write(self, op: str, data: bytes) -> None:
- self.pipe((op, data))
+ def write(self, data: KernelMessage) -> None:
+ self.pipe(data)
class PyodideStdout(Stdout):
diff --git a/marimo/_server/api/endpoints/ws.py b/marimo/_server/api/endpoints/ws.py
index 180a343b85..b5dc7ad61e 100644
--- a/marimo/_server/api/endpoints/ws.py
+++ b/marimo/_server/api/endpoints/ws.py
@@ -12,7 +12,6 @@ from marimo._ast.cell import CellConfig
from marimo._cli.upgrade import check_for_updates
from marimo._config.settings import GLOBAL_SETTINGS
from marimo._dependencies.dependencies import DependencyManager
-from marimo._messaging.msgspec_encoder import encode_json_bytes
from marimo._messaging.ops import (
Alert,
Banner,
@@ -22,6 +21,8 @@ from marimo._messaging.ops import (
KernelReady,
MessageOperation,
Reconnected,
+ deserialize_kernel_operation_name,
+ serialize_kernel_message,
)
from marimo._messaging.types import KernelMessage, NoopStream
from marimo._plugins.core.web_component import JSONType
@@ -338,8 +339,7 @@ class WebsocketHandler(SessionConsumer):
self.message_queue.put_nowait(
(
- KernelReady.name,
- encode_json_bytes(
+ serialize_kernel_message(
KernelReady(
codes=codes,
names=names,
@@ -354,8 +354,8 @@ class WebsocketHandler(SessionConsumer):
kiosk=kiosk,
capabilities=KernelCapabilities(),
)
- ),
- )
+ )
+ ),
)
def _reconnect_session(self, session: Session, replay: bool) -> None:
@@ -618,7 +618,8 @@ class WebsocketHandler(SessionConsumer):
async def listen_for_messages() -> None:
while True:
- (op, data) = await self.message_queue.get()
+ data = await self.message_queue.get()
+ op: str = deserialize_kernel_operation_name(data)
if op in KIOSK_ONLY_OPERATIONS and not self.kiosk:
LOGGER.debug(
@@ -697,7 +698,7 @@ class WebsocketHandler(SessionConsumer):
return listener
def write_operation(self, op: MessageOperation) -> None:
- self.message_queue.put_nowait((op.name, encode_json_bytes(op)))
+ self.message_queue.put_nowait(serialize_kernel_message(op))
def on_stop(self) -> None:
# Cancel the heartbeat task, reader
diff --git a/marimo/_server/export/__init__.py b/marimo/_server/export/__init__.py
index fed3a90afb..2170dcefa7 100644
--- a/marimo/_server/export/__init__.py
+++ b/marimo/_server/export/__init__.py
@@ -15,7 +15,12 @@ from marimo._config.manager import (
)
from marimo._messaging.cell_output import CellChannel, CellOutput
from marimo._messaging.errors import Error, is_unexpected_error
-from marimo._messaging.ops import CellOp, MessageOperation
+from marimo._messaging.ops import (
+ CellOp,
+ CompletedRun,
+ MessageOperation,
+ deserialize_kernel_message,
+)
from marimo._messaging.types import KernelMessage
from marimo._output.hypertext import patch_html_for_non_interactive_output
from marimo._runtime.requests import AppMetadata, SerializedCLIArgs
@@ -28,7 +33,6 @@ from marimo._server.models.models import InstantiateRequest
from marimo._server.session.session_view import SessionView
from marimo._types.ids import ConsumerId
from marimo._utils.marimo_path import MarimoPath
-from marimo._utils.parse_dataclass import parse_raw
LOGGER = _loggers.marimo_logger()
@@ -246,12 +250,11 @@ async def run_app_until_completion(
self,
) -> Callable[[KernelMessage], None]:
def listener(message: KernelMessage) -> None:
- op, data = message
+ data = deserialize_kernel_message(message)
# Print errors to stderr
- if op == "cell-op":
- op_data = parse_raw(data, CellOp)
- output = op_data.output
- console_output = op_data.console
+ if isinstance(data, CellOp):
+ output = data.output
+ console_output = data.console
if output and output.channel == CellChannel.MARIMO_ERROR:
errors = cast(list[Error], output.data)
for err in errors:
@@ -280,7 +283,7 @@ async def run_app_until_completion(
LOGGER.warning("Error printing console output")
pass
- if message[0] == "completed-run":
+ if isinstance(data, CompletedRun):
instantiated_event.set()
return listener
diff --git a/marimo/_server/session/session_view.py b/marimo/_server/session/session_view.py
index 87039e5fe7..29c5dfd7aa 100644
--- a/marimo/_server/session/session_view.py
+++ b/marimo/_server/session/session_view.py
@@ -21,7 +21,9 @@ from marimo._messaging.ops import (
Variables,
VariableValue,
VariableValues,
+ deserialize_kernel_message,
)
+from marimo._messaging.types import KernelMessage
from marimo._runtime.requests import (
ControlRequest,
CreationRequest,
@@ -32,7 +34,6 @@ from marimo._runtime.requests import (
from marimo._sql.engines.duckdb import INTERNAL_DUCKDB_ENGINE
from marimo._types.ids import CellId_t, WidgetModelId
from marimo._utils.lists import as_list
-from marimo._utils.parse_dataclass import parse_raw
ExportType = Literal["html", "md", "ipynb", "session"]
@@ -114,10 +115,10 @@ class SessionView:
def _add_last_run_code(self, req: ExecutionRequest) -> None:
self.last_executed_code[req.cell_id] = req.code
- def add_raw_operation(self, raw_operation: Any) -> None:
+ def add_raw_operation(self, raw_operation: KernelMessage) -> None:
self._touch()
# Type ignore because MessageOperation is a Union, not a class
- self.add_operation(parse_raw(raw_operation, cls=MessageOperation)) # type: ignore[arg-type]
+ self.add_operation(deserialize_kernel_message(raw_operation)) # type: ignore[arg-type]
def add_control_request(self, request: ControlRequest) -> None:
self._touch()
diff --git a/marimo/_server/sessions.py b/marimo/_server/sessions.py
index 0525e16e3b..497e6eba53 100644
--- a/marimo/_server/sessions.py
+++ b/marimo/_server/sessions.py
@@ -522,7 +522,7 @@ class Session:
self.message_distributor = QueueDistributor[KernelMessage](queue=q)
self.message_distributor.add_consumer(
- lambda msg: self.session_view.add_raw_operation(msg[1])
+ lambda msg: self.session_view.add_raw_operation(msg)
)
self.connect_consumer(session_consumer, main=True)
self.message_distributor.start()
diff --git a/tests/_ipc/test_kernel_communication.py b/tests/_ipc/test_kernel_communication.py
index 5865df3b2e..db709383c2 100644
--- a/tests/_ipc/test_kernel_communication.py
+++ b/tests/_ipc/test_kernel_communication.py
@@ -93,11 +93,11 @@ x = 42"""
while True:
try:
- op, encoded = queue_manager.stream_queue.get(timeout=0.01)
+ encoded = queue_manager.stream_queue.get(timeout=0.01)
decoded = json.loads(encoded)
messages.append(decoded)
- if op == "completed-run":
+ if decoded["op"] == "completed-run":
seen_completed = True
extra_collection_start = time.time()
diff --git a/tests/_messaging/mocks.py b/tests/_messaging/mocks.py
index 4ecf58a351..2eb34aaf7b 100644
--- a/tests/_messaging/mocks.py
+++ b/tests/_messaging/mocks.py
@@ -3,7 +3,9 @@ from __future__ import annotations
from typing import Any, Optional
from marimo._messaging.mimetypes import ConsoleMimeType
+from marimo._messaging.ops import CellOp, MessageOperation
from marimo._messaging.types import KernelMessage, Stderr, Stream
+from marimo._utils.parse_dataclass import parse_raw
class MockStream(Stream):
@@ -13,14 +15,24 @@ class MockStream(Stream):
if stream is not None and hasattr(stream, "messages"):
self.messages = stream.messages
- def write(self, op: str, data: bytes) -> None:
- self.messages.append((op, data))
+ def write(self, data: KernelMessage) -> None:
+ self.messages.append(data)
@property
def operations(self) -> list[dict[str, Any]]:
import json
- return [json.loads(op_data) for _op_name, op_data in self.messages]
+ return [json.loads(op_data) for op_data in self.messages]
+
+ @property
+ def parsed_operations(self) -> list[MessageOperation]:
+ return [
+ parse_raw(op_data, MessageOperation) for op_data in self.messages
+ ]
+
+ @property
+ def cell_ops(self) -> list[CellOp]:
+ return [op for op in self.parsed_operations if isinstance(op, CellOp)]
class MockStderr(Stderr):
diff --git a/tests/_messaging/test_console_output_worker.py b/tests/_messaging/test_console_output_worker.py
index 12cb87314b..cd2d729e0b 100644
--- a/tests/_messaging/test_console_output_worker.py
+++ b/tests/_messaging/test_console_output_worker.py
@@ -130,7 +130,7 @@ class TestConsoleOutputWorker:
)
assert len(stream.operations) == 1
- assert stream.messages[0][0] == "cell-op" # op
+ assert stream.operations[0]["op"] == "cell-op"
assert stream.operations[0]["cell_id"] == "cell1"
assert stream.operations[0]["console"]["channel"] == "stdout"
assert stream.operations[0]["console"]["mimetype"] == "text/plain"
diff --git a/tests/_messaging/test_print_override.py b/tests/_messaging/test_print_override.py
index 9da5c38e11..68ee7b9762 100644
--- a/tests/_messaging/test_print_override.py
+++ b/tests/_messaging/test_print_override.py
@@ -73,7 +73,7 @@ class TestPrintOverride:
# Message should be sent to the stream
assert len(stream.messages) == 1
- assert stream.messages[0][0] == "cell-op" # op
+ assert stream.operations[0]["op"] == "cell-op"
assert stream.operations[0]["cell_id"] == "cell1"
assert (
stream.operations[0]["console"]["channel"] == "stdout"
diff --git a/tests/_messaging/test_serde.py b/tests/_messaging/test_serde.py
new file mode 100644
index 0000000000..807031c661
--- /dev/null
+++ b/tests/_messaging/test_serde.py
@@ -0,0 +1,156 @@
+# Copyright 2024 Marimo. All rights reserved.
+from __future__ import annotations
+
+import json
+
+import msgspec
+import pytest
+
+from marimo._messaging.ops import (
+ Alert,
+ CompletedRun,
+ Interrupted,
+ deserialize_kernel_message,
+ deserialize_kernel_operation_name,
+ serialize_kernel_message,
+)
+from marimo._messaging.types import KernelMessage
+
+
+class TestSerializeKernelMessage:
+ def test_serialize_interrupted(self) -> None:
+ """Test serializing an Interrupted message."""
+ message = Interrupted()
+
+ result = serialize_kernel_message(message)
+
+ assert isinstance(result, bytes)
+
+ parsed = json.loads(result.decode())
+ assert parsed["op"] == "interrupted"
+
+ def test_serialize_alert(self) -> None:
+ """Test serializing an Alert message."""
+ message = Alert(
+ title="Test Alert",
+ description="This is a test alert",
+ variant="danger",
+ )
+
+ result = serialize_kernel_message(message)
+
+ assert isinstance(result, bytes)
+
+ parsed = json.loads(result.decode())
+ assert parsed["op"] == "alert"
+ assert parsed["title"] == "Test Alert"
+ assert parsed["description"] == "This is a test alert"
+ assert parsed["variant"] == "danger"
+
+
+class TestDeserializeKernelMessage:
+ def test_deserialize_interrupted(self) -> None:
+ """Test deserializing an Interrupted message."""
+
+ message_dict = {"op": "interrupted"}
+ kernel_message = KernelMessage(json.dumps(message_dict).encode())
+
+ result = deserialize_kernel_message(kernel_message)
+
+ assert isinstance(result, Interrupted)
+
+ def test_deserialize_alert(self) -> None:
+ """Test deserializing an Alert message."""
+
+ message_dict = {
+ "op": "alert",
+ "title": "Test Alert",
+ "description": "This is a test alert",
+ "variant": "danger",
+ }
+ kernel_message = KernelMessage(json.dumps(message_dict).encode())
+
+ result = deserialize_kernel_message(kernel_message)
+
+ assert isinstance(result, Alert)
+ assert result.title == "Test Alert"
+ assert result.description == "This is a test alert"
+ assert result.variant == "danger"
+
+ def test_deserialize_invalid_json(self) -> None:
+ """Test deserializing invalid JSON should raise an error."""
+ invalid_message = KernelMessage(b"invalid json")
+
+ with pytest.raises(msgspec.DecodeError):
+ assert deserialize_kernel_message(invalid_message)
+
+ def test_deserialize_unknown_message_type(self) -> None:
+ """Test deserializing unknown message type should raise an error."""
+
+ message_dict = {"name": "unknown-message-type", "data": "some data"}
+ kernel_message = KernelMessage(json.dumps(message_dict).encode())
+
+ with pytest.raises(msgspec.ValidationError):
+ assert deserialize_kernel_message(kernel_message)
+
+ def test_deserialize_missing_required_fields(self) -> None:
+ """Test deserializing message with missing required fields should raise an error."""
+
+ message_dict = {
+ "name": "kernel-ready"
+ # Missing required fields: cell_ids, codes
+ }
+ kernel_message = KernelMessage(json.dumps(message_dict).encode())
+
+ with pytest.raises(msgspec.ValidationError):
+ assert deserialize_kernel_message(kernel_message)
+
+
+class TestRoundTripSerialization:
+ def test_round_trip_interrupted(self) -> None:
+ """Test round-trip for Interrupted message."""
+ original = Interrupted()
+
+ serialized = serialize_kernel_message(original)
+ deserialized = deserialize_kernel_message(serialized)
+
+ assert isinstance(deserialized, Interrupted)
+
+ def test_round_trip_alert(self) -> None:
+ """Test round-trip for Alert message."""
+ original = Alert(
+ title="Warning",
+ description="Something went wrong",
+ variant="danger",
+ )
+
+ serialized = serialize_kernel_message(original)
+ deserialized = deserialize_kernel_message(serialized)
+
+ assert isinstance(deserialized, Alert)
+ assert deserialized.title == original.title
+ assert deserialized.description == original.description
+ assert deserialized.variant == original.variant
+
+ def test_round_trip_with_unicode(self) -> None:
+ """Test round-trip with unicode characters."""
+ original = Alert(
+ title="测试标题",
+ description="Тестовое описание with émojis 🚀",
+ variant="danger",
+ )
+
+ serialized = serialize_kernel_message(original)
+ deserialized = deserialize_kernel_message(serialized)
+
+ assert isinstance(deserialized, Alert)
+ assert deserialized.title == original.title
+ assert deserialized.description == original.description
+ assert deserialized.variant == original.variant
+
+
+def test_deserialize_kernel_operation_name() -> None:
+ """Test deserializing a KernelOperationName message."""
+ original = CompletedRun()
+ serialized = serialize_kernel_message(original)
+ assert deserialize_kernel_operation_name(serialized) == "completed-run"
diff --git a/tests/_messaging/test_types.py b/tests/_messaging/test_types.py
index 4a6e2be556..9395d068ec 100644
--- a/tests/_messaging/test_types.py
+++ b/tests/_messaging/test_types.py
@@ -17,7 +17,7 @@ class TestStream:
stream = NoopStream()
# Should not raise any exceptions
- stream.write("test_op", {"key": "value"})
+ stream.write({"key": "value"})
stream.stop()
# cell_id should be None by default
diff --git a/tests/_pyodide/test_pyodide_streams.py b/tests/_pyodide/test_pyodide_streams.py
index 5f051f9969..779690f08a 100644
--- a/tests/_pyodide/test_pyodide_streams.py
+++ b/tests/_pyodide/test_pyodide_streams.py
@@ -52,10 +52,9 @@ def pyodide_stdin(pyodide_: PyodideStream) -> PyodideStdin:
class TestPyodideStream:
def test_write(self, pyodide_: PyodideStream, pyodide_pipe: Mock) -> None:
- op = "test-op"
data = {"key": "value"}
- pyodide_.write(op, data)
- pyodide_pipe.assert_called_once_with((op, data))
+ pyodide_.write(data)
+ pyodide_pipe.assert_called_once_with(data)
class TestPyodideStdout:
@@ -74,9 +73,9 @@ class TestPyodideStdout:
data = "test output"
pyodide_stdout.write(data)
assert pyodide_pipe.call_count == 1
- op, msg_bytes = pyodide_pipe.call_args[0][0]
- assert op == "cell-op"
+ msg_bytes = pyodide_pipe.call_args[0][0]
msg = json.loads(msg_bytes)
+ assert msg["op"] == "cell-op"
assert msg["cell_id"] == pyodide_stdout.stream.cell_id
assert msg["console"]["mimetype"] == "text/plain"
assert msg["console"]["data"] == data
@@ -105,9 +104,9 @@ class TestPyodideStderr:
data = "test error"
pyodide_stderr.write(data)
assert pyodide_pipe.call_count == 1
- op, msg_bytes = pyodide_pipe.call_args[0][0]
- assert op == "cell-op"
+ msg_bytes = pyodide_pipe.call_args[0][0]
msg = json.loads(msg_bytes)
+ assert msg["op"] == "cell-op"
assert msg["cell_id"] == pyodide_stderr.stream.cell_id
assert msg["console"]["mimetype"] == "text/plain"
assert msg["console"]["data"] == data
@@ -140,9 +139,9 @@ class TestPyodideStdin:
assert result == "test input\n"
# Verify prompt was sent
assert pyodide_pipe.call_count == 1
- op, msg_bytes = pyodide_pipe.call_args[0][0]
- assert op == "cell-op"
+ msg_bytes = pyodide_pipe.call_args[0][0]
msg = json.loads(msg_bytes)
+ assert msg["op"] == "cell-op"
assert msg["cell_id"] == pyodide_stdin.stream.cell_id
assert msg["console"]["mimetype"] == "text/plain"
assert msg["console"]["data"] == ""
@@ -160,9 +159,9 @@ class TestPyodideStdin:
assert result == "test input\n"
# Verify prompt was sent
assert pyodide_pipe.call_count == 1
- op, msg_bytes = pyodide_pipe.call_args[0][0]
- assert op == "cell-op"
+ msg_bytes = pyodide_pipe.call_args[0][0]
msg = json.loads(msg_bytes)
+ assert msg["op"] == "cell-op"
assert msg["cell_id"] == pyodide_stdin.stream.cell_id
assert msg["console"]["mimetype"] == "text/plain"
assert msg["console"]["data"] == "Enter: "
@@ -184,9 +183,9 @@ class TestPyodideStdin:
assert result == ["line1", "line2", "line3", ""]
# Verify prompt was sent
assert pyodide_pipe.call_count == 1
- op, msg_bytes = pyodide_pipe.call_args[0][0]
- assert op == "cell-op"
+ msg_bytes = pyodide_pipe.call_args[0][0]
msg = json.loads(msg_bytes)
+ assert msg["op"] == "cell-op"
assert msg["cell_id"] == pyodide_stdin.stream.cell_id
assert msg["console"]["mimetype"] == "text/plain"
assert msg["console"]["data"] == ""
diff --git a/tests/_runtime/test_capture.py b/tests/_runtime/test_capture.py
index a92c7aace1..4af4856879 100644
--- a/tests/_runtime/test_capture.py
+++ b/tests/_runtime/test_capture.py
@@ -9,10 +9,10 @@ from tests.conftest import ExecReqProvider, MockedKernel
def _has_output(messages: list[KernelMessage], pattern: str) -> bool:
- for op, data in messages:
+ for data in messages:
data = json.loads(data)
if (
- op == "cell-op"
+ data["op"] == "cell-op"
and data["output"] is not None
and re.match(pattern, data["output"]["data"])
):
diff --git a/tests/_runtime/test_complete.py b/tests/_runtime/test_complete.py
index f665cfc036..30a69a7682 100644
--- a/tests/_runtime/test_complete.py
+++ b/tests/_runtime/test_complete.py
@@ -365,14 +365,14 @@ class CaptureStream(Stream):
def __init__(self):
self.messages: list[KernelMessage] = []
- def write(self, op: str, data: bytes) -> None:
- self.messages.append((op, data))
+ def write(self, data: KernelMessage) -> None:
+ self.messages.append(data)
@property
def operations(self) -> list[dict[str, Any]]:
import json
- return [json.loads(op_data) for _op_name, op_data in self.messages]
+ return [json.loads(op_data) for op_data in self.messages]
# TODO add test cases for all other completion modalities
@@ -480,14 +480,14 @@ mixed_keys = {"static_key": "foo", str(random.randint(0, 10)): "bar"}
stream=local_stream,
)
- message_name = local_stream.messages[0]
+ message_name = local_stream.operations[0]["op"]
content = local_stream.operations[0]
prefix_length = content["prefix_length"]
options = content["options"]
options_values = [option["name"] for option in options]
assert len(local_stream.messages) == 1
- assert message_name[0] == CompletionResult.name
+ assert message_name == CompletionResult.name
# TODO if `expects_completions=False`, something else than `_maybe_get_key_options()`
# could be returning values
if expects_key_completion is False:
diff --git a/tests/_runtime/test_query_params.py b/tests/_runtime/test_query_params.py
index 8fcdfb1efc..6e557308bd 100644
--- a/tests/_runtime/test_query_params.py
+++ b/tests/_runtime/test_query_params.py
@@ -1,17 +1,16 @@
from __future__ import annotations
import unittest
-from unittest.mock import MagicMock
import pytest
-from marimo._messaging.types import Stream
from marimo._runtime.params import CLIArgs, QueryParams
+from tests._messaging.mocks import MockStream
class TestQueryParams(unittest.TestCase):
def setUp(self) -> None:
- self.mock_stream = MagicMock(spec=Stream)
+ self.mock_stream = MockStream()
self.params = QueryParams(
{"key1": "value1", "key2": ["value2", "value3"]},
stream=self.mock_stream,
@@ -60,60 +59,66 @@ class TestQueryParams(unittest.TestCase):
self.params["key3"] = "value4"
assert self.params.get("key3") == "value4"
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-set",
- "data": b'{"op":"query-params-set","key":"key3","value":"value4"}',
+ "key": "key3",
+ "value": "value4",
}
def test_setitem_null(self) -> None:
self.params["key1"] = None # type: ignore
assert self.params.get("key1") is None
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key1","value":null}',
+ "key": "key1",
+ "value": None,
}
def test_setitem_empty(self) -> None:
self.params["key1"] = []
assert self.params.get("key1") is None
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key1","value":null}',
+ "key": "key1",
+ "value": None,
}
def test_set(self) -> None:
self.params.set("key1", "value5")
assert self.params.get("key1") == "value5"
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-set",
- "data": b'{"op":"query-params-set","key":"key1","value":"value5"}',
+ "key": "key1",
+ "value": "value5",
}
def test_set_null(self) -> None:
self.params.set("key1", None) # type: ignore
assert self.params.get("key1") is None
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key1","value":null}',
+ "key": "key1",
+ "value": None,
}
def test_set_empty(self) -> None:
self.params.set("key1", [])
assert self.params.get("key1") is None
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args[1] == {
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key1","value":null}',
+ "key": "key1",
+ "value": None,
}
def test_append(self) -> None:
@@ -122,14 +127,16 @@ class TestQueryParams(unittest.TestCase):
self.params.append("key4", "value6")
assert self.params.get("key4") == "value6"
- assert self.mock_stream.write.call_count == 2
- assert self.mock_stream.write.call_args_list[0][1] == {
+ assert len(self.mock_stream.messages) == 2
+ assert self.mock_stream.operations[0] == {
"op": "query-params-append",
- "data": b'{"op":"query-params-append","key":"key1","value":"value5"}',
+ "key": "key1",
+ "value": "value5",
}
- assert self.mock_stream.write.call_args_list[1][1] == {
+ assert self.mock_stream.operations[1] == {
"op": "query-params-append",
- "data": b'{"op":"query-params-append","key":"key4","value":"value6"}',
+ "key": "key4",
+ "value": "value6",
}
def test_delete(self) -> None:
@@ -148,18 +155,21 @@ class TestQueryParams(unittest.TestCase):
assert str(self.params) == "{}"
assert repr(self.params) == "QueryParams({})"
- assert self.mock_stream.write.call_count == 3
- assert self.mock_stream.write.call_args_list[0][1] == {
+ assert len(self.mock_stream.messages) == 3
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key1","value":null}',
+ "key": "key1",
+ "value": None,
}
- assert self.mock_stream.write.call_args_list[1][1] == {
+ assert self.mock_stream.operations[1] == {
"op": "query-params-append",
- "data": b'{"op":"query-params-append","key":"key2","value":"value4"}',
+ "key": "key2",
+ "value": "value4",
}
- assert self.mock_stream.write.call_args_list[2][1] == {
+ assert self.mock_stream.operations[2] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key2","value":null}',
+ "key": "key2",
+ "value": None,
}
def test_remove(self) -> None:
@@ -170,14 +180,16 @@ class TestQueryParams(unittest.TestCase):
self.params.remove("key2")
assert self.params.get("key2") is None
- assert self.mock_stream.write.call_count == 2
- assert self.mock_stream.write.call_args_list[0][1] == {
+ assert len(self.mock_stream.messages) == 2
+ assert self.mock_stream.operations[0] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key2","value":"value2"}',
+ "key": "key2",
+ "value": "value2",
}
- assert self.mock_stream.write.call_args_list[1][1] == {
+ assert self.mock_stream.operations[1] == {
"op": "query-params-delete",
- "data": b'{"op":"query-params-delete","key":"key2","value":null}',
+ "key": "key2",
+ "value": None,
}
def test_clear(self) -> None:
@@ -186,11 +198,8 @@ class TestQueryParams(unittest.TestCase):
assert str(self.params) == "{}"
assert repr(self.params) == "QueryParams({})"
- assert self.mock_stream.write.call_count == 1
- assert self.mock_stream.write.call_args_list[0][1] == {
- "op": "query-params-clear",
- "data": b'{"op":"query-params-clear"}',
- }
+ assert len(self.mock_stream.messages) == 1
+ assert self.mock_stream.operations[0] == {"op": "query-params-clear"}
class TestCLIArgs(unittest.TestCase):
diff --git a/tests/_runtime/test_runtime.py b/tests/_runtime/test_runtime.py
index 5e9335001d..5940db5b06 100644
--- a/tests/_runtime/test_runtime.py
+++ b/tests/_runtime/test_runtime.py
@@ -22,7 +22,11 @@ from marimo._messaging.errors import (
MarimoSyntaxError,
MultipleDefinitionError,
)
-from marimo._messaging.ops import CellOp
+from marimo._messaging.ops import (
+ CellOp,
+ Variables,
+ deserialize_kernel_message,
+)
from marimo._messaging.types import NoopStream
from marimo._plugins.ui._core.ids import IDProvider
from marimo._plugins.ui._core.ui_element import UIElement
@@ -41,7 +45,6 @@ from marimo._runtime.requests import (
from marimo._runtime.runtime import Kernel, notebook_dir, notebook_location
from marimo._runtime.scratch import SCRATCH_CELL_ID
from marimo._server.model import SessionMode
-from marimo._utils import parse_dataclass
from marimo._utils.parse_dataclass import parse_raw
from tests._messaging.mocks import MockStderr, MockStream
from tests.conftest import ExecReqProvider, MockedKernel
@@ -458,11 +461,9 @@ class TestExecution:
assert len(k._uninstantiated_execution_requests) == 3
await k.run([er1])
- cell_ops = [
- parse_dataclass.parse_raw(msg[1], CellOp)
- for msg in k.stream.messages
- if msg[0] == "cell-op"
- ]
+ stream = MockStream(k.stream)
+ cell_ops = [deserialize_kernel_message(msg) for msg in stream.messages]
+ cell_ops = [op for op in cell_ops if isinstance(op, CellOp)]
er1_set_not_stale_before_run = False
for op in cell_ops:
if op.cell_id == er1.cell_id and op.status == "running":
@@ -2802,11 +2803,8 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ stream = MockStream(mocked_kernel.stream)
+ cell_ops = stream.cell_ops
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
assert n_queued == 1
@@ -2827,11 +2825,7 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ cell_ops = mocked_kernel.stream.cell_ops
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
assert n_queued == 1
@@ -2854,11 +2848,8 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ stream = MockStream(mocked_kernel.stream)
+ cell_ops = stream.cell_ops
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
assert n_queued == 1
@@ -2879,11 +2870,8 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ stream = MockStream(mocked_kernel.stream)
+ cell_ops = stream.cell_ops
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
assert n_queued == 1
@@ -2905,11 +2893,8 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ stream = MockStream(mocked_kernel.stream)
+ cell_ops = stream.cell_ops
# er_1 and er_2
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
@@ -2944,11 +2929,8 @@ class TestStateTransitions:
]
)
- cell_ops = [
- parse_raw(op_data, CellOp)
- for op_name, op_data in mocked_kernel.stream.messages
- if op_name == "cell-op"
- ]
+ stream = MockStream(mocked_kernel.stream)
+ cell_ops = stream.cell_ops
# er_1 and er_2
n_queued = sum([1 for op in cell_ops if op.status == "queued"])
@@ -2976,36 +2958,46 @@ class TestStateTransitions:
er = exec_req.get("x = 1")
await k.run([er])
initial_messages = len(
- [m for m in stream.messages if m[0] == "variables"]
+ [m for m in stream.operations if isinstance(m, Variables)]
)
assert initial_messages == 1
# Re-running same cell should now broadcast Variables
stream.messages.clear()
await k.run([er])
- assert sum(1 for m in stream.messages if m[0] == "variables") == 1
+ assert (
+ sum(1 for m in stream.operations if isinstance(m, Variables)) == 1
+ )
# Adding a new variable should broadcast Variables
stream.messages.clear()
er_2 = exec_req.get("y = 1")
await k.run([er_2])
- assert sum(1 for m in stream.messages if m[0] == "variables") == 1
+ assert (
+ sum(1 for m in stream.operations if isinstance(m, Variables)) == 1
+ )
# Adding a new edge should broadcast Variables
stream.messages.clear()
await k.run([exec_req.get("z = y")])
- assert sum(1 for m in stream.messages if m[0] == "variables") == 1
+ assert (
+ sum(1 for m in stream.operations if isinstance(m, Variables)) == 1
+ )
# Modifying value without changing edges/defs should now broadcast
stream.messages.clear()
er_2.code = "y = 2"
await k.run([exec_req.get_with_id(er_2.cell_id, er_2.code)])
- assert sum(1 for m in stream.messages if m[0] == "variables") == 1
+ assert (
+ sum(1 for m in stream.operations if isinstance(m, Variables)) == 1
+ )
# Deleting a cell should broadcast Variables
stream.messages.clear()
await k.delete_cell(DeleteCellRequest(cell_id=er_2.cell_id))
- assert sum(1 for m in stream.messages if m[0] == "variables") == 1
+ assert (
+ sum(1 for m in stream.operations if isinstance(m, Variables)) == 1
+ )
@staticmethod
async def test_variables_broadcast_on_usage_change(
diff --git a/tests/_runtime/test_runtime_secrets.py b/tests/_runtime/test_runtime_secrets.py
index a7c6e7d40a..27f0803e3c 100644
--- a/tests/_runtime/test_runtime_secrets.py
+++ b/tests/_runtime/test_runtime_secrets.py
@@ -12,7 +12,7 @@ from marimo._runtime.requests import (
)
from marimo._runtime.runtime import SecretsCallbacks
from marimo._types.ids import RequestId
-from marimo._utils.parse_dataclass import parse_raw
+from tests._messaging.mocks import MockStream
from tests._runtime.test_runtime import MockedKernel
@@ -34,17 +34,18 @@ async def test_list_secrets_with_values(
)
# Check that the broadcast message was sent with the correct secrets
- messages = [
+ stream = MockStream(mocked_kernel.stream)
+ secret_messages = [
msg
- for msg in mocked_kernel.stream.messages
- if msg[0] == "secret-keys-result"
+ for msg in stream.parsed_operations
+ if isinstance(msg, SecretKeysResult)
]
- assert len(messages) == 1
- secret_messages = parse_raw(messages[0][1], SecretKeysResult)
- assert len(secret_messages.secrets) == 1
- assert secret_messages.secrets[0].provider == "env"
+ assert len(secret_messages) == 1
+ first_secret_message = secret_messages[0]
+ assert first_secret_message.secrets[0].provider == "env"
assert all(
- secret in secret_messages.secrets[0].keys for secret in test_secrets
+ secret in first_secret_message.secrets[0].keys
+ for secret in test_secrets
)
# Clean up
diff --git a/tests/_runtime/test_threads.py b/tests/_runtime/test_threads.py
index 86029b3dad..37a01bf652 100644
--- a/tests/_runtime/test_threads.py
+++ b/tests/_runtime/test_threads.py
@@ -1,19 +1,11 @@
import time
-from typing import Any, cast
-from marimo._messaging.types import KernelMessage
from marimo._runtime.requests import DeleteCellRequest
from marimo._runtime.runtime import Kernel
from tests._messaging.mocks import MockStream
from tests.conftest import ExecReqProvider
-def _msg_as_dict(msg: KernelMessage) -> dict[str, Any]:
- import json
-
- return json.loads(msg[1].decode("utf-8"))
-
-
# Doesn't work with strict kernel ...
async def test_thread_set_global(k: Kernel, exec_req: ExecReqProvider) -> None:
"""Test that a thread starts and runs."""
@@ -98,17 +90,14 @@ async def test_thread_output_append(
assert not k.errors
time.sleep(0.01) # noqa: ASYNC251
# The main thread should not have any output, but the new thread should
- messages = cast(list[KernelMessage], k.globals["stream"].messages)
- for m in messages:
- if m[0] == "cell-op" and _msg_as_dict(m)["output"] is not None:
- assert "hello" not in _msg_as_dict(m)["output"]["data"]
- assert "world" not in _msg_as_dict(m)["output"]["data"]
- thread_stream_messages = cast(
- list[KernelMessage], k.globals["thread_stream"].messages
- )
- assert len(thread_stream_messages) == 2
- assert "hello" in _msg_as_dict(thread_stream_messages[0])["output"]["data"]
- assert "world" in _msg_as_dict(thread_stream_messages[1])["output"]["data"]
+ cell_ops = MockStream(k.globals["stream"]).cell_ops
+ for m in cell_ops:
+ if m.output is not None:
+ assert "hello" not in m.output.data
+ assert "world" not in m.output.data
+ thread_stream_cell_ops = MockStream(k.globals["thread_stream"]).cell_ops
+ assert "hello" in thread_stream_cell_ops[0].output.data
+ assert "world" in thread_stream_cell_ops[1].output.data
async def test_thread_print(k: Kernel, exec_req: ExecReqProvider) -> None:
diff --git a/tests/_server/session/test_session_view.py b/tests/_server/session/test_session_view.py
index 2ac45a0900..d482462436 100644
--- a/tests/_server/session/test_session_view.py
+++ b/tests/_server/session/test_session_view.py
@@ -22,6 +22,7 @@ from marimo._messaging.ops import (
Variables,
VariableValue,
VariableValues,
+ serialize_kernel_message,
)
from marimo._runtime.requests import (
CreationRequest,
@@ -268,7 +269,7 @@ def test_add_variables() -> None:
session_view = SessionView()
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Variables(
variables=[
VariableDeclaration(
@@ -282,7 +283,7 @@ def test_add_variables() -> None:
)
)
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
VariableValues(
variables=[
VariableValue.create(name="var1", value=1),
@@ -304,7 +305,7 @@ def test_add_datasets() -> None:
session_view = SessionView()
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Datasets(
tables=[
DataTable(
@@ -352,7 +353,7 @@ def test_add_datasets() -> None:
# Can add a new table and overwrite an existing table
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Datasets(
tables=[
DataTable(
@@ -396,7 +397,7 @@ def test_add_datasets() -> None:
# Can filter out tables from new variables
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Variables(
variables=[
VariableDeclaration(
@@ -414,7 +415,7 @@ def test_add_datasets() -> None:
def test_add_datasets_clear_channel() -> None:
session_view = SessionView()
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Datasets(
tables=[
DataTable(
@@ -447,7 +448,7 @@ def test_add_datasets_clear_channel() -> None:
assert "df1" in names
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Datasets(
tables=[
DataTable(
@@ -477,7 +478,7 @@ def test_add_data_source_connections() -> None:
# Add initial connections
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
DataSourceConnections(
connections=[
DataSourceConnection(
@@ -514,7 +515,7 @@ def test_add_data_source_connections() -> None:
# Add new connection and update existing
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
DataSourceConnections(
connections=[
DataSourceConnection(
@@ -555,7 +556,7 @@ def test_add_data_source_connections() -> None:
# Filter out connections from variables
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Variables(
variables=[
VariableDeclaration(
@@ -576,7 +577,7 @@ def test_add_data_source_connections() -> None:
def test_add_cell_op() -> None:
session_view = SessionView()
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
CellOp(
cell_id=cell_id, output=initial_output, status=initial_status
)
@@ -859,7 +860,7 @@ def test_dataset_filter_by_engine_and_variable() -> None:
# Initially add three tables: one with an engine, one with a variable name, and one with neither
session_view.add_raw_operation(
- serialize(
+ serialize_kernel_message(
Datasets(
tables=[
DataTable(
diff --git a/tests/conftest.py b/tests/conftest.py
index b6f373e023..4653bfff76 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -17,7 +17,11 @@ from marimo._ast.app import App, CellManager
from marimo._ast.app_config import _AppConfig
from marimo._config.config import DEFAULT_CONFIG
from marimo._messaging.mimetypes import ConsoleMimeType
-from marimo._messaging.ops import CellOp, MessageOperation
+from marimo._messaging.ops import (
+ CellOp,
+ MessageOperation,
+ deserialize_kernel_message,
+)
from marimo._messaging.print_override import print_override
from marimo._messaging.streams import (
ThreadSafeStderr,
@@ -37,7 +41,6 @@ from marimo._runtime.runtime import Kernel
from marimo._save.cache import ModuleStub
from marimo._server.model import SessionMode
from marimo._types.ids import CellId_t
-from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
from collections.abc import Generator
@@ -69,14 +72,13 @@ class _MockStream(ThreadSafeStream):
messages: list[KernelMessage] = dataclasses.field(default_factory=list)
- def write(self, op: str, data: bytes) -> None:
- self.messages.append((op, data))
+ def write(self, data: KernelMessage) -> None:
+ self.messages.append(data)
@property
def operations(self) -> list[MessageOperation]:
return [
- parse_raw(op_data, cls=MessageOperation)
- for _op_name, op_data in self.messages
+ deserialize_kernel_message(op_data) for op_data in self.messages
]
@property