Switch to msgspec_m fork (#6774)

manzt · web-flow · commit 3321239c1552 · 2025-10-14T14:29:46.000-04:00
Switches off `msgspec` to our `msgspec_m` fork. The 3.14 wheels aren't
on PyPI yet. I'll follow up with another PR adding a smoke test for
running marimo cli without `--no-build`.
diff --git a/marimo/_ai/_types.py b/marimo/_ai/_types.py
@@ -15,7 +15,7 @@
     cast,
 )
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._utils.parse_dataclass import parse_raw
diff --git a/marimo/_ast/cell.py b/marimo/_ast/cell.py
@@ -9,7 +9,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._ast.parse import ast_parse
diff --git a/marimo/_cli/development/commands.py b/marimo/_cli/development/commands.py
@@ -9,8 +9,8 @@
 from typing import TYPE_CHECKING, Any
 
 import click
-import msgspec
-import msgspec.json
+import msgspec_m as msgspec
+import msgspec_m.json
 
 from marimo._cli.print import orange
 from marimo._data.models import DataType
@@ -275,7 +275,7 @@ class KnownUnions(msgspec.Struct):
         error: MarimoError
         data_type: DataType
 
-    specs = msgspec.json.schema_components(
+    specs = msgspec_m.json.schema_components(
         MESSAGES + [KnownUnions],
         ref_template="#/components/schemas/{name}",
     )
diff --git a/marimo/_ipc/types.py b/marimo/_ipc/types.py
@@ -3,8 +3,8 @@
 
 import typing
 
-import msgspec
-import msgspec.json
+import msgspec_m as msgspec
+import msgspec_m.json
 
 from marimo._ast.cell import CellConfig
 from marimo._config.config import MarimoConfig
@@ -40,4 +40,4 @@ def encode_json(self) -> bytes:
 
     @classmethod
     def decode_json(cls, buf: bytes) -> KernelArgs:
-        return msgspec.json.decode(buf, type=cls)
+        return msgspec_m.json.decode(buf, type=cls)
diff --git a/marimo/_messaging/cell_output.py b/marimo/_messaging/cell_output.py
@@ -7,7 +7,7 @@
 from enum import Enum
 from typing import Any, Union
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._messaging.errors import Error
 from marimo._messaging.mimetypes import ConsoleMimeType, KnownMimeType
diff --git a/marimo/_messaging/completion_option.py b/marimo/_messaging/completion_option.py
@@ -5,7 +5,7 @@
 
 from typing import Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 
 class CompletionOption(msgspec.Struct):
diff --git a/marimo/_messaging/errors.py b/marimo/_messaging/errors.py
@@ -3,7 +3,7 @@
 
 from typing import Optional, Union
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._runtime.dataflow import EdgeWithVar
 from marimo._types.ids import CellId_t
diff --git a/marimo/_messaging/msgspec_encoder.py b/marimo/_messaging/msgspec_encoder.py
@@ -10,8 +10,8 @@
 from pathlib import PurePath
 from typing import Any
 
-import msgspec
-import msgspec.json
+import msgspec_m as msgspec
+import msgspec_m.json
 
 from marimo._dependencies.dependencies import DependencyManager
 
@@ -200,7 +200,7 @@ def enc_hook(obj: Any) -> Any:
     return repr(obj)
 
 
-_encoder = msgspec.json.Encoder(enc_hook=enc_hook, decimal_format="number")
+_encoder = msgspec_m.json.Encoder(enc_hook=enc_hook, decimal_format="number")
 
 
 def encode_json_bytes(obj: Any) -> bytes:
diff --git a/marimo/_messaging/ops.py b/marimo/_messaging/ops.py
@@ -19,7 +19,7 @@
 )
 from uuid import uuid4
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers as loggers
 from marimo._ast.app_config import _AppConfig
diff --git a/marimo/_plugins/ui/_impl/tables/narwhals_table.py b/marimo/_plugins/ui/_impl/tables/narwhals_table.py
@@ -7,7 +7,7 @@
 from functools import cached_property
 from typing import TYPE_CHECKING, Any, Literal, Optional, Union, cast
 
-import msgspec
+import msgspec_m as msgspec
 import narwhals.stable.v2 as nw
 from narwhals.typing import IntoDataFrameT, IntoLazyFrameT
 
diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.py
@@ -10,7 +10,7 @@
 from pathlib import Path
 from typing import Any, Callable, TypeVar
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._ast.cell import CellConfig
diff --git a/marimo/_runtime/packages/package_manager.py b/marimo/_runtime/packages/package_manager.py
@@ -6,7 +6,7 @@
 import sys
 from typing import TYPE_CHECKING, Callable, Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._dependencies.dependencies import DependencyManager
@@ -127,7 +127,7 @@ def run(
 
         if log_callback is None:
             # Original behavior - just run the command without capturing output
-            completed_process = subprocess.run(command)  # noqa: ASYNC101
+            completed_process = subprocess.run(command)
             return completed_process.returncode == 0
 
         # Stream output to both the callback and the terminal
diff --git a/marimo/_runtime/requests.py b/marimo/_runtime/requests.py
@@ -14,7 +14,7 @@
 )
 from uuid import uuid4
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._ast.app_config import _AppConfig
 from marimo._config.config import MarimoConfig
diff --git a/marimo/_secrets/models.py b/marimo/_secrets/models.py
@@ -4,7 +4,7 @@
 from abc import ABC, abstractmethod
 from typing import Literal
 
-import msgspec
+import msgspec_m as msgspec
 
 SecretProviderType = Literal["env", "dotenv"]
 
diff --git a/marimo/_server/api/endpoints/home.py b/marimo/_server/api/endpoints/home.py
@@ -178,7 +178,7 @@ async def tutorial(
                     schema:
                         $ref: "#/components/schemas/MarimoFile"
     """
-    import msgspec
+    import msgspec_m as msgspec
 
     # Create a new tutorial file and return the filepath
     try:
diff --git a/marimo/_server/errors.py b/marimo/_server/errors.py
@@ -3,7 +3,7 @@
 
 from typing import TYPE_CHECKING, Any
 
-import msgspec
+import msgspec_m as msgspec
 from starlette.exceptions import HTTPException
 from starlette.responses import JSONResponse
 
diff --git a/marimo/_server/models/completion.py b/marimo/_server/models/completion.py
@@ -3,7 +3,7 @@
 
 from typing import Any, Literal, Optional, Union
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._ai._types import ChatMessage
 from marimo._server.ai.tools.types import ToolDefinition
diff --git a/marimo/_server/models/export.py b/marimo/_server/models/export.py
@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 
 class ExportAsHTMLRequest(msgspec.Struct, rename="camel"):
diff --git a/marimo/_server/models/files.py b/marimo/_server/models/files.py
@@ -3,7 +3,7 @@
 
 from typing import Literal, Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._server.models.models import BaseResponse
 
diff --git a/marimo/_server/models/home.py b/marimo/_server/models/home.py
@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._server.models.files import FileInfo
 from marimo._tutorials import Tutorial  # type: ignore
diff --git a/marimo/_server/models/models.py b/marimo/_server/models/models.py
@@ -4,7 +4,7 @@
 import os
 from typing import Any, Literal, Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._ast.cell import CellConfig
 from marimo._runtime.requests import (
diff --git a/marimo/_server/models/packages.py b/marimo/_server/models/packages.py
@@ -3,7 +3,7 @@
 
 from typing import Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._runtime.packages.package_manager import PackageDescription
 
diff --git a/marimo/_server/models/secrets.py b/marimo/_server/models/secrets.py
@@ -1,7 +1,7 @@
 # Copyright 2025 Marimo. All rights reserved.
 from __future__ import annotations
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo._secrets.models import SecretKeysWithProvider, SecretProviderType
 
diff --git a/marimo/_server/responses.py b/marimo/_server/responses.py
@@ -8,7 +8,7 @@
 from marimo._messaging.msgspec_encoder import encode_json_bytes
 
 if TYPE_CHECKING:
-    import msgspec
+    import msgspec_m as msgspec
 
 
 class StructResponse(starlette.responses.Response):
diff --git a/marimo/_snippets/snippets.py b/marimo/_snippets/snippets.py
@@ -5,7 +5,7 @@
 from pathlib import Path
 from typing import Any, Optional
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._ast.load import load_app
diff --git a/marimo/_sql/parse.py b/marimo/_sql/parse.py
@@ -4,7 +4,7 @@
 import re
 from typing import Literal, Optional, Union
 
-import msgspec
+import msgspec_m as msgspec
 
 from marimo import _loggers
 from marimo._dependencies.dependencies import DependencyManager
diff --git a/marimo/_utils/dataclass_to_openapi.py b/marimo/_utils/dataclass_to_openapi.py
@@ -28,8 +28,8 @@
 
 from typing import Sequence  # noqa: UP035
 
-import msgspec
-import msgspec.json
+import msgspec_m as msgspec
+import msgspec_m.json
 
 
 class PythonTypeToOpenAPI:
@@ -52,7 +52,7 @@ def convert(
             Dict[str, Any]: The OpenAPI schema.
         """
         if type(py_type) is type(msgspec.Struct):
-            return msgspec.json.schema(py_type)["$defs"][py_type.__name__]  # type: ignore[no-any-return]
+            return msgspec_m.json.schema(py_type)["$defs"][py_type.__name__]  # type: ignore[no-any-return]
 
         origin = get_origin(py_type)
         optional_name_overrides = self.optional_name_overrides
diff --git a/marimo/_utils/msgspec_basestruct.py b/marimo/_utils/msgspec_basestruct.py
@@ -3,7 +3,7 @@
 
 from typing import TYPE_CHECKING, Any
 
-import msgspec
+import msgspec_m as msgspec
 
 if TYPE_CHECKING:
     from pydantic import GetCoreSchemaHandler
diff --git a/marimo/_utils/parse_dataclass.py b/marimo/_utils/parse_dataclass.py
@@ -18,8 +18,8 @@
     get_type_hints,
 )
 
-import msgspec
-import msgspec.json
+import msgspec_m as msgspec
+import msgspec_m.json
 
 # Import NotRequired from typing_extensions for Python < 3.11
 if sys.version_info < (3, 11):
@@ -206,7 +206,7 @@ def _parse_msgspec(
     if isinstance(value, dict):
         return msgspec.convert(value, strict=strict, type=cls)
 
-    return msgspec.json.decode(value, strict=strict, type=cls)
+    return msgspec_m.json.decode(value, strict=strict, type=cls)
 
 
 def parse_raw(
diff --git a/pixi.lock b/pixi.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -49,7 +49,7 @@ dependencies = [
     "narwhals>=2.0.0",
     # for packaging.version; not sure what the lower bound is.
     "packaging",
-    "msgspec>=0.19.0",
+    "msgspec_m>=0.19.1",
 ]
 readme = "README.md"
 license = { file = "LICENSE" }
diff --git a/tests/_messaging/test_messaging_errors.py b/tests/_messaging/test_messaging_errors.py
diff --git a/tests/_messaging/test_serde.py b/tests/_messaging/test_serde.py
diff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.py
diff --git a/tests/_server/api/endpoints/test_packages.py b/tests/_server/api/endpoints/test_packages.py
diff --git a/tests/_server/test_errors.py b/tests/_server/test_errors.py
diff --git a/tests/_utils/snapshots/complex_project_tree_from_raw.json b/tests/_utils/snapshots/complex_project_tree_from_raw.json
diff --git a/tests/_utils/test_msgspec_basestruct.py b/tests/_utils/test_msgspec_basestruct.py
diff --git a/tests/_utils/test_parse_dataclass.py b/tests/_utils/test_parse_dataclass.py
diff --git a/tests/utils.py b/tests/utils.py

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`cast,`
`16`	`16`	`)`
`17`	`17`
`18`		`-import msgspec`
	`18`	`+import msgspec_m as msgspec`
`19`	`19`
`20`	`20`	`from marimo import _loggers`
`21`	`21`	`from marimo._utils.parse_dataclass import parse_raw`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`)`
`20`	`20`	`from uuid import uuid4`
`21`	`21`
`22`		`-import msgspec`
	`22`	`+import msgspec_m as msgspec`
`23`	`23`
`24`	`24`	`from marimo import _loggers as loggers`
`25`	`25`	`from marimo._ast.app_config import _AppConfig`