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.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix: preserve insertion order for NumPy integer dictionary keys (#10788)
Myles Scolnick982d8cd91226
diff --git a/marimo/_output/formatters/structures.py b/marimo/_output/formatters/structures.pyindex 7398120e70..df5dcabb79 100644--- a/marimo/_output/formatters/structures.py+++ b/marimo/_output/formatters/structures.py@@ -4,6 +4,7 @@ from __future__ import annotationsimport jsonimport sysfrom collections import defaultdict+from numbers import Integralfrom typing import TYPE_CHECKING, Anyfrom marimo._messaging.mimetypes import KnownMimeType@@ -50,9 +51,10 @@ def _key_formatter(k: object) -> object:return kif k is None:return "text/plain+none:"- if isinstance(k, int):+ if isinstance(k, Integral):# No bigint/int split for keys: the numeric payload lives inside# a string, so there's no JS `Number` precision concern.+ # Include NumPy integers; unprefixed numeric keys are reordered by JS.return f"text/plain+int:{k}"if isinstance(k, float):# Cover the JSON-spec-violating NaN/Inf cases; json.dumps woulddiff --git a/tests/_output/formatters/test_structures.py b/tests/_output/formatters/test_structures.pyindex 391206b082..efcbd77375 100644--- a/tests/_output/formatters/test_structures.py+++ b/tests/_output/formatters/test_structures.py@@ -5,6 +5,7 @@ import sysfrom collections import defaultdictfrom typing import Any, cast+import pytestfrom inline_snapshot import snapshotfrom marimo._dependencies.dependencies import DependencyManager@@ -534,6 +535,51 @@ def test_format_structure_dict_bigint_key_encoded_as_int() -> None:)+ "dtype", ["int16", "int32", "int64", "uint8", "uint16", "uint32", "uint64"]+)+def test_format_structure_dict_numpy_integer_key_order(dtype: str) -> None:+ """Integer keys must be encoded so JavaScript preserves insertion order."""+ np = pytest.importorskip("numpy")+ StructuresFormatter().register()++ int_dict = {42: "First", 1: "Second", 128: "Third", 2: "Fourth"}+ numpy_dict = {getattr(np, dtype)(k): v for k, v in int_dict.items()}+ _, data = get_and_format((int_dict, numpy_dict))++ for parsed in json.loads(data):+ assert list(parsed.items()) == snapshot(+ [+ ("text/plain+int:42", "First"),+ ("text/plain+int:1", "Second"),+ ("text/plain+int:128", "Third"),+ ("text/plain+int:2", "Fourth"),+ ]+ )+++def test_format_structure_dict_numpy_integer_keys_do_not_collide() -> None:+ np = pytest.importorskip("numpy")+ StructuresFormatter().register()++ _, data = get_and_format(+ {+ np.int64(-42): "negative",+ "-42": "negative string",+ np.uint64(2**64 - 1): "bigint",+ str(2**64 - 1): "bigint string",+ }+ )+ assert json.loads(data) == snapshot(+ {+ "text/plain+int:-42": "negative",+ "-42": "negative string",+ "text/plain+int:18446744073709551615": "bigint",+ "18446744073709551615": "bigint string",+ }+ )++def test_format_structure_dict_nan_inf_float_keys_are_strict_json() -> None:"""NaN/Inf keys must not emit bare `NaN`/`Infinity` (invalid JSON)."""StructuresFormatter().register()