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: msgspec Python 3.14 compatibility (#6749)
Akshay Agrawal4ca9cb242726
diff --git a/marimo/__main__.py b/marimo/__main__.pyindex fb6cadec86..e6fbd7a4c2 100644--- a/marimo/__main__.py+++ b/marimo/__main__.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from marimo._cli.cli import mainif __name__ == "__main__":diff --git a/marimo/_ai/_tools/tools/notebooks.py b/marimo/_ai/_tools/tools/notebooks.pyindex 1ea0b36833..0d2d1b6553 100644--- a/marimo/_ai/_tools/tools/notebooks.py+++ b/marimo/_ai/_tools/tools/notebooks.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from dataclasses import dataclass, fieldfrom typing import Optionaldiff --git a/marimo/_ai/_tools/tools/tables_and_variables.py b/marimo/_ai/_tools/tools/tables_and_variables.pyindex c763afcf95..1b31008e73 100644--- a/marimo/_ai/_tools/tools/tables_and_variables.py+++ b/marimo/_ai/_tools/tools/tables_and_variables.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from dataclasses import dataclass, fieldfrom typing import Optional@@ -63,7 +65,7 @@ class GetTablesAndVariables(return self._get_tables_and_variables(session, args.variable_names)def _get_tables_and_variables(- self, session: "Session", variable_names: list[str]+ self, session: Session, variable_names: list[str]) -> TablesAndVariablesOutput:session_view = session.session_view# convert to set for O(1) lookupdiff --git a/marimo/_ai/_tools/tools_registry.py b/marimo/_ai/_tools/tools_registry.pyindex 3a6000c39a..2025d22b04 100644--- a/marimo/_ai/_tools/tools_registry.py+++ b/marimo/_ai/_tools/tools_registry.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from typing import Anyfrom marimo._ai._tools.base import ToolBasediff --git a/marimo/_ai/llm/__init__.py b/marimo/_ai/llm/__init__.pyindex 6f596dc9fa..e35c3a176a 100644--- a/marimo/_ai/llm/__init__.py+++ b/marimo/_ai/llm/__init__.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from marimo._ai.llm._impl import anthropic, bedrock, google, groq, openai__all__ = ["openai", "anthropic", "google", "groq", "bedrock"]diff --git a/marimo/_ast/__init__.py b/marimo/_ast/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_ast/__init__.py+++ b/marimo/_ast/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_ast/app_config.py b/marimo/_ast/app_config.pyindex 15bd1018be..fe7b905411 100644--- a/marimo/_ast/app_config.py+++ b/marimo/_ast/app_config.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsimport osfrom dataclasses import asdict, dataclass, field@@ -43,7 +44,7 @@ class _AppConfig:@staticmethoddef from_untrusted_dict(updates: dict[str, Any], silent: bool = False- ) -> "_AppConfig":+ ) -> _AppConfig:# Certain flags are useful to pass to App for construction, but# shouldn't make it into the config. (e.g. the _filename flag is# internal)@@ -65,7 +66,7 @@ class _AppConfig:k: v for (k, v) in asdict(self).items() if not k.startswith("_")}- def update(self, updates: dict[str, Any]) -> "_AppConfig":+ def update(self, updates: dict[str, Any]) -> _AppConfig:config_dict = asdict(self)for key in updates:if key in config_dict:diff --git a/marimo/_ast/cell_id.py b/marimo/_ast/cell_id.pyindex 7cb7a77749..90bb86fa26 100644--- a/marimo/_ast/cell_id.py+++ b/marimo/_ast/cell_id.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import randomimport stringfrom uuid import UUID, uuid4diff --git a/marimo/_ast/errors.py b/marimo/_ast/errors.pyindex df1d9e3413..4d39657f4f 100644--- a/marimo/_ast/errors.py+++ b/marimo/_ast/errors.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsclass SetupRootError(Exception):diff --git a/marimo/_ast/names.py b/marimo/_ast/names.pyindex 40dc06af41..1a9acc4f68 100644--- a/marimo/_ast/names.py+++ b/marimo/_ast/names.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+DEFAULT_CELL_NAME = "_"SETUP_CELL_NAME = "setup"# Intentionally an invalid name characterdiff --git a/marimo/_ast/sql_utils.py b/marimo/_ast/sql_utils.pyindex 4b06e6202d..736594b76a 100644--- a/marimo/_ast/sql_utils.py+++ b/marimo/_ast/sql_utils.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsfrom typing import Literal, Optional, Uniondiff --git a/marimo/_cli/__init__.py b/marimo/_cli/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_cli/__init__.py+++ b/marimo/_cli/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_cli/cli_validators.py b/marimo/_cli/cli_validators.pyindex bf7f1f2e81..84bd864397 100644--- a/marimo/_cli/cli_validators.py+++ b/marimo/_cli/cli_validators.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from pathlib import Pathfrom typing import Any, Optionaldiff --git a/marimo/_cli/export/cloudflare.py b/marimo/_cli/export/cloudflare.pyindex 43624805a8..5caa7313ef 100644--- a/marimo/_cli/export/cloudflare.py+++ b/marimo/_cli/export/cloudflare.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from pathlib import Pathfrom marimo._cli.print import bold, echo, greendiff --git a/marimo/_cli/utils.py b/marimo/_cli/utils.pyindex 13152b3456..98b3c7179e 100644--- a/marimo/_cli/utils.py+++ b/marimo/_cli/utils.py@@ -1,12 +1,16 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations-from pathlib import Pathfrom sys import stdout+from typing import TYPE_CHECKINGimport clickfrom marimo._config.settings import GLOBAL_SETTINGS+if TYPE_CHECKING:+ from pathlib import Path+def prompt_to_overwrite(path: Path) -> bool:if GLOBAL_SETTINGS.YES:diff --git a/marimo/_config/__init__.py b/marimo/_config/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_config/__init__.py+++ b/marimo/_config/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_convert/notebook.py b/marimo/_convert/notebook.pyindex 019c33f76d..b67a645416 100644--- a/marimo/_convert/notebook.py+++ b/marimo/_convert/notebook.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from marimo._schemas.notebook import (NotebookCell,NotebookCellConfig,diff --git a/marimo/_entrypoints/ids.py b/marimo/_entrypoints/ids.pyindex 066eb6c253..829f014071 100644--- a/marimo/_entrypoints/ids.py+++ b/marimo/_entrypoints/ids.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from typing import Literal# Internal entrypoints. Not user-facing as the API is not stable.diff --git a/marimo/_entrypoints/registry.py b/marimo/_entrypoints/registry.pyindex f85239b481..4cc3ef72c5 100644--- a/marimo/_entrypoints/registry.py+++ b/marimo/_entrypoints/registry.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import osfrom importlib.metadata import entry_pointsfrom typing import TYPE_CHECKING, Generic, Optional, TypeVar, cast@@ -150,7 +152,7 @@ class EntryPointRegistry(Generic[T]):return f"{type(self).__name__}(group={self.entry_point_group!r}, registered={self.names()!r})"-def get_entry_points(group: KnownEntryPoint) -> "EntryPoints":+def get_entry_points(group: KnownEntryPoint) -> EntryPoints:ep = entry_points()if hasattr(ep, "select"):return ep.select(group=group)diff --git a/marimo/_islands/__init__.py b/marimo/_islands/__init__.pyindex 93169d3598..2f0bfdfd4f 100644--- a/marimo/_islands/__init__.py+++ b/marimo/_islands/__init__.py@@ -1,4 +1,5 @@# Copyright 2024 Marimo. All rights reserved.+__all__ = ["MarimoIslandGenerator","MarimoIslandStub",diff --git a/marimo/_lint/formatters/__init__.py b/marimo/_lint/formatters/__init__.pyindex 93eea1e4d6..9dd5c95748 100644--- a/marimo/_lint/formatters/__init__.py+++ b/marimo/_lint/formatters/__init__.py@@ -1,6 +1,8 @@# Copyright 2025 Marimo. All rights reserved."""Formatters for diagnostic output."""+from __future__ import annotations+from marimo._lint.formatters.base import DiagnosticFormatterfrom marimo._lint.formatters.full import FullFormatterfrom marimo._lint.formatters.json import (diff --git a/marimo/_lint/rules/__init__.py b/marimo/_lint/rules/__init__.pyindex 9d895d72f2..2e085b1903 100644--- a/marimo/_lint/rules/__init__.py+++ b/marimo/_lint/rules/__init__.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from marimo._lint.rules.base import LintRulefrom marimo._lint.rules.breaking import BREAKING_RULE_CODESfrom marimo._lint.rules.formatting import FORMATTING_RULE_CODESdiff --git a/marimo/_lint/rules/breaking/__init__.py b/marimo/_lint/rules/breaking/__init__.pyindex 4868f1c8dc..ca0c429d98 100644--- a/marimo/_lint/rules/breaking/__init__.py+++ b/marimo/_lint/rules/breaking/__init__.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from marimo._lint.rules.base import LintRulefrom marimo._lint.rules.breaking.graph import (CycleDependenciesRule,diff --git a/marimo/_lint/rules/formatting/__init__.py b/marimo/_lint/rules/formatting/__init__.pyindex 977c612def..cd79b20446 100644--- a/marimo/_lint/rules/formatting/__init__.py+++ b/marimo/_lint/rules/formatting/__init__.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from marimo._lint.rules.base import LintRule, UnsafeFixRulefrom marimo._lint.rules.formatting.empty_cells import EmptyCellRulefrom marimo._lint.rules.formatting.general import GeneralFormattingRulediff --git a/marimo/_lint/rules/runtime/__init__.py b/marimo/_lint/rules/runtime/__init__.pyindex c28451c72e..efa4ff76db 100644--- a/marimo/_lint/rules/runtime/__init__.py+++ b/marimo/_lint/rules/runtime/__init__.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from marimo._lint.rules.base import LintRulefrom marimo._lint.rules.runtime.self_import import SelfImportRulediff --git a/marimo/_lint/visitors.py b/marimo/_lint/visitors.pyindex 71a444ecfd..2397c718d0 100644--- a/marimo/_lint/visitors.py+++ b/marimo/_lint/visitors.py@@ -1,6 +1,8 @@# Copyright 2025 Marimo. All rights reserved."""AST visitors for linting purposes."""+from __future__ import annotations+import astfrom typing import Optionaldiff --git a/marimo/_mcp/server/lifespan.py b/marimo/_mcp/server/lifespan.pyindex 804ff35fab..478d516ecb 100644--- a/marimo/_mcp/server/lifespan.py+++ b/marimo/_mcp/server/lifespan.py@@ -1,6 +1,7 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import contextlib-from collections.abc import AsyncIteratorfrom typing import TYPE_CHECKINGfrom marimo._loggers import marimo_logger@@ -8,11 +9,13 @@ from marimo._loggers import marimo_loggerLOGGER = marimo_logger()if TYPE_CHECKING:+ from collections.abc import AsyncIterator+from starlette.applications import Starlette@contextlib.asynccontextmanager-async def mcp_server_lifespan(app: "Starlette") -> AsyncIterator[None]:+async def mcp_server_lifespan(app: Starlette) -> AsyncIterator[None]:"""Lifespan for MCP server functionality (exposing marimo as MCP server)."""try:diff --git a/marimo/_mcp/server/main.py b/marimo/_mcp/server/main.pyindex 0538ec2293..bdbff1f3da 100644--- a/marimo/_mcp/server/main.py+++ b/marimo/_mcp/server/main.py@@ -6,6 +6,8 @@ This module implements an MCP server that provides LLMs with access to marimonotebook context and functionality."""+from __future__ import annotations+from typing import TYPE_CHECKINGfrom marimo._ai._tools.base import ToolContext@@ -17,9 +19,10 @@ LOGGER = marimo_logger()if TYPE_CHECKING:from starlette.applications import Starlette+ from starlette.types import Receive, Scope, Send-def setup_mcp_server(app: "Starlette") -> None:+def setup_mcp_server(app: Starlette) -> None:"""Create and configure MCP server for marimo integration.Args:@@ -34,7 +37,6 @@ def setup_mcp_server(app: "Starlette") -> None:from starlette.middleware.base import BaseHTTPMiddlewarefrom starlette.responses import JSONResponsefrom starlette.routing import Mount- from starlette.types import Receive, Scope, Sendmcp = FastMCP("marimo-mcp-server",diff --git a/marimo/_messaging/__init__.py b/marimo/_messaging/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_messaging/__init__.py+++ b/marimo/_messaging/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_output/formatters/__init__.py b/marimo/_output/formatters/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_output/formatters/__init__.py+++ b/marimo/_output/formatters/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_output/justify.py b/marimo/_output/justify.pyindex 96d65b4812..3a73fc51c8 100644--- a/marimo/_output/justify.py+++ b/marimo/_output/justify.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from marimo._output.formatting import as_htmlfrom marimo._output.hypertext import Htmlfrom marimo._output.rich_help import mddocdiff --git a/marimo/_output/md_extensions/breakless_lists.py b/marimo/_output/md_extensions/breakless_lists.pyindex 78a981506e..e200a2456b 100644--- a/marimo/_output/md_extensions/breakless_lists.py+++ b/marimo/_output/md_extensions/breakless_lists.py@@ -1,7 +1,8 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsimport re-from xml.etree.ElementTree import Element+from typing import TYPE_CHECKINGfrom markdown import ( # type: ignoreExtension,@@ -10,6 +11,9 @@ from markdown import ( # type: ignoretreeprocessors,)+if TYPE_CHECKING:+ from xml.etree.ElementTree import Element+class BreaklessListsPreprocessor(preprocessors.Preprocessor): # type: ignore[misc]"""diff --git a/marimo/_output/md_extensions/external_links.py b/marimo/_output/md_extensions/external_links.pyindex c15d43b602..b97238fc48 100644--- a/marimo/_output/md_extensions/external_links.py+++ b/marimo/_output/md_extensions/external_links.py@@ -1,9 +1,14 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations++from typing import TYPE_CHECKINGfrom urllib.parse import urlparse-from xml.etree.ElementTree import Elementfrom markdown import Extension, Markdown, treeprocessors # type: ignore+if TYPE_CHECKING:+ from xml.etree.ElementTree import Element+# Adapted from https://github.com/squidfunk/mkdocs-material/discussions/3660#discussioncomment-6725823 # noqa: E501diff --git a/marimo/_output/md_extensions/flexible_indent.py b/marimo/_output/md_extensions/flexible_indent.pyindex efc674f382..8c4f304fdc 100644--- a/marimo/_output/md_extensions/flexible_indent.py+++ b/marimo/_output/md_extensions/flexible_indent.py@@ -1,4 +1,5 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsimport rediff --git a/marimo/_output/superjson.py b/marimo/_output/superjson.pyindex 4caa930aa0..e0983bf606 100644--- a/marimo/_output/superjson.py+++ b/marimo/_output/superjson.py@@ -1,5 +1,7 @@# Copyright 2025 Marimo. All rights reserved.# This data serializes+from __future__ import annotations+from typing import Anydiff --git a/marimo/_plugins/__init__.py b/marimo/_plugins/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/__init__.py+++ b/marimo/_plugins/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_plugins/stateless/__init__.py b/marimo/_plugins/stateless/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/stateless/__init__.py+++ b/marimo/_plugins/stateless/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_plugins/ui/_core/__init__.py b/marimo/_plugins/ui/_core/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/ui/_core/__init__.py+++ b/marimo/_plugins/ui/_core/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_plugins/ui/_impl/__init__.py b/marimo/_plugins/ui/_impl/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/ui/_impl/__init__.py+++ b/marimo/_plugins/ui/_impl/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_plugins/ui/_impl/chat/__init__.py b/marimo/_plugins/ui/_impl/chat/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/ui/_impl/chat/__init__.py+++ b/marimo/_plugins/ui/_impl/chat/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_plugins/ui/_impl/dataframes/__init__.py b/marimo/_plugins/ui/_impl/dataframes/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_plugins/ui/_impl/dataframes/__init__.py+++ b/marimo/_plugins/ui/_impl/dataframes/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_pyodide/restartable_task.py b/marimo/_pyodide/restartable_task.pyindex bb7dee8c19..ec17680fdb 100644--- a/marimo/_pyodide/restartable_task.py+++ b/marimo/_pyodide/restartable_task.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import asynciofrom typing import Any, Callable, Optionaldiff --git a/marimo/_runtime/__init__.py b/marimo/_runtime/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_runtime/__init__.py+++ b/marimo/_runtime/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_runtime/context/__init__.py b/marimo/_runtime/context/__init__.pyindex ffbda592dc..da2f1db9d3 100644--- a/marimo/_runtime/context/__init__.py+++ b/marimo/_runtime/context/__init__.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+__all__ = ["get_context","safe_get_context",diff --git a/marimo/_runtime/handlers.py b/marimo/_runtime/handlers.pyindex 4a57b72e01..bf795c9f3e 100644--- a/marimo/_runtime/handlers.py+++ b/marimo/_runtime/handlers.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import osfrom dataclasses import dataclassfrom typing import TYPE_CHECKING, Any, Callable@@ -34,7 +36,7 @@ def construct_interrupt_handler(return interrupt_handler-def construct_sigterm_handler(kernel: "Kernel") -> Callable[[int, Any], None]:+def construct_sigterm_handler(kernel: Kernel) -> Callable[[int, Any], None]:del kernel@dataclassdiff --git a/marimo/_runtime/input_override.py b/marimo/_runtime/input_override.pyindex 0362ae72e7..264cc291d3 100644--- a/marimo/_runtime/input_override.py+++ b/marimo/_runtime/input_override.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import functoolsimport sysdiff --git a/marimo/_runtime/packages/package_managers.py b/marimo/_runtime/packages/package_managers.pyindex bea7965864..157668d007 100644--- a/marimo/_runtime/packages/package_managers.py+++ b/marimo/_runtime/packages/package_managers.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from marimo._runtime.packages.conda_package_manager import PixiPackageManagerfrom marimo._runtime.packages.package_manager import PackageManagerfrom marimo._runtime.packages.pypi_package_manager import (diff --git a/marimo/_runtime/reload/__init__.py b/marimo/_runtime/reload/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_runtime/reload/__init__.py+++ b/marimo/_runtime/reload/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_runtime/runner/__init__.py b/marimo/_runtime/runner/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_runtime/runner/__init__.py+++ b/marimo/_runtime/runner/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_runtime/runner/hooks.py b/marimo/_runtime/runner/hooks.pyindex a93f373494..9ebda90d69 100644--- a/marimo/_runtime/runner/hooks.py+++ b/marimo/_runtime/runner/hooks.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+__all__ = [# hooks to run before the runner starts running its subgraph"PREPARATION_HOOKS",diff --git a/marimo/_runtime/watch/__init__.py b/marimo/_runtime/watch/__init__.pyindex 3ac28b6a1d..dcefc2ffd5 100644--- a/marimo/_runtime/watch/__init__.py+++ b/marimo/_runtime/watch/__init__.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from marimo._runtime.watch._directory import directoryfrom marimo._runtime.watch._file import filediff --git a/marimo/_save/__init__.py b/marimo/_save/__init__.pyindex 1369e9eed5..c57b3d3b08 100644--- a/marimo/_save/__init__.py+++ b/marimo/_save/__init__.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import marimo._save.cache as _cache_module # prevent variable shadowingfrom marimo._save.cache import MARIMO_CACHE_VERSIONfrom marimo._save.save import cache, lru_cache, persistent_cachediff --git a/marimo/_save/loaders/__init__.py b/marimo/_save/loaders/__init__.pyindex 62bfaba0fb..3a596e85da 100644--- a/marimo/_save/loaders/__init__.py+++ b/marimo/_save/loaders/__init__.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from typing import Literalfrom marimo._save.loaders.json import JsonLoaderdiff --git a/marimo/_save/stores/__init__.py b/marimo/_save/stores/__init__.pyindex c37e5dafcd..0125465bd1 100644--- a/marimo/_save/stores/__init__.py+++ b/marimo/_save/stores/__init__.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import copyfrom typing import Optional, castdiff --git a/marimo/_server/__init__.py b/marimo/_server/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_server/__init__.py+++ b/marimo/_server/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_server/ai/constants.py b/marimo/_server/ai/constants.pyindex a976d44bd1..c3e05e7bf3 100644--- a/marimo/_server/ai/constants.py+++ b/marimo/_server/ai/constants.py@@ -1,3 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+DEFAULT_MAX_TOKENS = 4096DEFAULT_MODEL = "openai/gpt-4o"diff --git a/marimo/_server/ai/ids.py b/marimo/_server/ai/ids.pyindex 7ccc3fa416..f00f0a0daf 100644--- a/marimo/_server/ai/ids.py+++ b/marimo/_server/ai/ids.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from dataclasses import dataclassfrom typing import NewType@@ -23,7 +25,7 @@ class AiModelId:return f"AiModelId(provider={self.provider}, model={self.model})"@staticmethod- def from_model(model_id: str) -> "AiModelId":+ def from_model(model_id: str) -> AiModelId:if "/" not in model_id:LOGGER.warning(f"Invalid model ID: {model_id}. Model ID must be in the format <provider>/<model>"diff --git a/marimo/_server/ai/mcp/__init__.py b/marimo/_server/ai/mcp/__init__.pyindex 8829b78618..078a43280a 100644--- a/marimo/_server/ai/mcp/__init__.py+++ b/marimo/_server/ai/mcp/__init__.py@@ -1,6 +1,8 @@# Copyright 2024 Marimo. All rights reserved."""MCP (Model Context Protocol) client implementation for marimo."""+from __future__ import annotations+from marimo._server.ai.mcp.client import (MCPClient,MCPServerConnection,diff --git a/marimo/_server/ai/tools/types.py b/marimo/_server/ai/tools/types.pyindex 291b2f10e9..7bc715ef83 100644--- a/marimo/_server/ai/tools/types.py+++ b/marimo/_server/ai/tools/types.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsfrom dataclasses import dataclassfrom typing import Any, Callable, Literal, Optional, TypeVardiff --git a/marimo/_server/codes.py b/marimo/_server/codes.pyindex 9e7dc84d10..d99086dbc1 100644--- a/marimo/_server/codes.py+++ b/marimo/_server/codes.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from enum import IntEnumdiff --git a/marimo/_server/exceptions.py b/marimo/_server/exceptions.pyindex 96dff37a7c..2633be9919 100644--- a/marimo/_server/exceptions.py+++ b/marimo/_server/exceptions.py@@ -1,4 +1,7 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations++class InvalidSessionException(Exception):def __init__(self, message: str) -> None:super().__init__(message)diff --git a/marimo/_server/registry.py b/marimo/_server/registry.pyindex bb8b052db3..909141a5c2 100644--- a/marimo/_server/registry.py+++ b/marimo/_server/registry.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from typing import TYPE_CHECKINGfrom marimo._entrypoints.registry import EntryPointRegistry@@ -9,10 +11,10 @@ if TYPE_CHECKING:from starlette.types import Lifespan-MIDDLEWARE_REGISTRY: EntryPointRegistry["Middleware"] = EntryPointRegistry(+MIDDLEWARE_REGISTRY: EntryPointRegistry[Middleware] = EntryPointRegistry(entry_point_group="marimo.server.asgi.middleware")-LIFESPAN_REGISTRY: EntryPointRegistry["Lifespan[Starlette]"] = (+LIFESPAN_REGISTRY: EntryPointRegistry[Lifespan[Starlette]] = (EntryPointRegistry(entry_point_group="marimo.server.asgi.lifespan"))diff --git a/marimo/_server/responses.py b/marimo/_server/responses.pyindex 5937ec548c..aa10098f94 100644--- a/marimo/_server/responses.py+++ b/marimo/_server/responses.py@@ -1,9 +1,15 @@# Copyright 2025 Marimo. All rights reserved.-import msgspec+from __future__ import annotations++from typing import TYPE_CHECKING+import starlette.responsesfrom marimo._messaging.msgspec_encoder import encode_json_bytes+if TYPE_CHECKING:+ import msgspec+class StructResponse(starlette.responses.Response):media_type = "application/json"diff --git a/marimo/_server/session/__init__.py b/marimo/_server/session/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_server/session/__init__.py+++ b/marimo/_server/session/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_sql/error_utils.py b/marimo/_sql/error_utils.pyindex dc179e59a6..6ea1ada18f 100644--- a/marimo/_sql/error_utils.py+++ b/marimo/_sql/error_utils.py@@ -1,11 +1,14 @@# Copyright 2025 Marimo. All rights reserved.-import ast+from __future__ import annotations+import refrom typing import TYPE_CHECKING, Callable, Optional, TypedDictfrom marimo._dependencies.dependencies import DependencyManagerif TYPE_CHECKING:+ import ast+from marimo._messaging.errors import MarimoSQLErrorfrom marimo import _loggers@@ -179,7 +182,7 @@ def create_sql_error_metadata()-def metadata_to_sql_error(metadata: SQLErrorMetadata) -> "MarimoSQLError":+def metadata_to_sql_error(metadata: SQLErrorMetadata) -> MarimoSQLError:"""Convert SQLErrorMetadata to MarimoSQLError for frontend messaging."""from marimo._messaging.errors import MarimoSQLError@@ -226,7 +229,7 @@ def log_sql_error(def create_sql_error_from_exception(exception: BaseException, cell: object-) -> "MarimoSQLError":+) -> MarimoSQLError:"""Create a MarimoSQLError from a SQL parsing exception."""# Get SQL statement from cellsql_statement = ""diff --git a/marimo/_sql/parse.py b/marimo/_sql/parse.pyindex db30d155dd..ce666aa106 100644--- a/marimo/_sql/parse.py+++ b/marimo/_sql/parse.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsimport refrom typing import Literal, Optional, Uniondiff --git a/marimo/_types/lifespan.py b/marimo/_types/lifespan.pyindex 4388f9ce05..2d1bd49337 100644--- a/marimo/_types/lifespan.py+++ b/marimo/_types/lifespan.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+from collections.abc import (Callable,Mapping,diff --git a/marimo/_utils/__init__.py b/marimo/_utils/__init__.pyindex be52407b50..69635186a3 100644--- a/marimo/_utils/__init__.py+++ b/marimo/_utils/__init__.py@@ -1 +1,2 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsdiff --git a/marimo/_utils/code.py b/marimo/_utils/code.pyindex 149d2b9797..f2aa664108 100644--- a/marimo/_utils/code.py+++ b/marimo/_utils/code.py@@ -1,4 +1,5 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotationsdef hash_code(code: str) -> str:diff --git a/marimo/_utils/debounce.py b/marimo/_utils/debounce.pyindex 9168a13681..992a6583ac 100644--- a/marimo/_utils/debounce.py+++ b/marimo/_utils/debounce.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import timefrom functools import wrapsfrom typing import Any, Callable, TypeVar, castdiff --git a/marimo/_utils/deprecated.py b/marimo/_utils/deprecated.pyindex 4406cf8472..22b68b6e70 100644--- a/marimo/_utils/deprecated.py+++ b/marimo/_utils/deprecated.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import functoolsimport warningsfrom typing import Any, Callablediff --git a/marimo/_utils/disposable.py b/marimo/_utils/disposable.pyindex 7ad32569df..2debe47171 100644--- a/marimo/_utils/disposable.py+++ b/marimo/_utils/disposable.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+from typing import Callable@@ -18,5 +20,5 @@ class Disposable:return self._is_disposed@staticmethod- def empty() -> "Disposable":+ def empty() -> Disposable:return Disposable(lambda: None)diff --git a/marimo/_utils/exiting.py b/marimo/_utils/exiting.pyindex 1380cd6256..a09273b6ec 100644--- a/marimo/_utils/exiting.py+++ b/marimo/_utils/exiting.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import atexitfrom dataclasses import dataclassdiff --git a/marimo/_utils/files.py b/marimo/_utils/files.pyindex 9f3c7db7d5..38fe638fd7 100644--- a/marimo/_utils/files.py+++ b/marimo/_utils/files.py@@ -1,10 +1,14 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import fnmatchimport osimport re-from collections.abc import AsyncGenerator, Generatorfrom pathlib import Path-from typing import Union+from typing import TYPE_CHECKING, Union++if TYPE_CHECKING:+ from collections.abc import AsyncGenerator, Generatordef natural_sort(filename: str) -> list[Union[int, str]]:diff --git a/marimo/_utils/format_signature.py b/marimo/_utils/format_signature.pyindex cdbe0d54fc..24ae34a56b 100644--- a/marimo/_utils/format_signature.py+++ b/marimo/_utils/format_signature.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import textwrapdiff --git a/marimo/_utils/hashable.py b/marimo/_utils/hashable.pyindex 1b04318e2e..3d5889d54c 100644--- a/marimo/_utils/hashable.py+++ b/marimo/_utils/hashable.py@@ -1,4 +1,5 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsfrom typing import Anydiff --git a/marimo/_utils/once.py b/marimo/_utils/once.pyindex 2774202806..91522e6776 100644--- a/marimo/_utils/once.py+++ b/marimo/_utils/once.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import weakreffrom functools import wrapsfrom typing import Any, Callable, TypeVar, castdiff --git a/marimo/_utils/requests.py b/marimo/_utils/requests.pyindex 926a71c990..7d9c331bd8 100644--- a/marimo/_utils/requests.py+++ b/marimo/_utils/requests.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import jsonimport urllib.errorimport urllib.parse@@ -58,7 +60,7 @@ class Response:# This matches Python's universal newline mode used by Path.read_text()return decoded.replace("\r\n", "\n").replace("\r", "\n")- def raise_for_status(self) -> "Response":+ def raise_for_status(self) -> Response:"""Raise an exception for non-2xx status codes.Returns:diff --git a/marimo/_utils/rst_to_html.py b/marimo/_utils/rst_to_html.pyindex e90eb80f25..7388163ab4 100644--- a/marimo/_utils/rst_to_html.py+++ b/marimo/_utils/rst_to_html.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import contextlibimport iodiff --git a/marimo/_utils/theme.py b/marimo/_utils/theme.pyindex 2a0c3348d5..d17e89bd16 100644--- a/marimo/_utils/theme.py+++ b/marimo/_utils/theme.py@@ -1,4 +1,5 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotationsfrom marimo._config.config import Themefrom marimo._config.manager import get_default_config_managerdiff --git a/marimo/_utils/timer.py b/marimo/_utils/timer.pyindex 8f7578bd4b..328a8761f2 100644--- a/marimo/_utils/timer.py+++ b/marimo/_utils/timer.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import functoolsimport timefrom typing import Any, Callablediff --git a/marimo/_utils/tmpdir.py b/marimo/_utils/tmpdir.pyindex b5e00a783a..8a5038fb39 100644--- a/marimo/_utils/tmpdir.py+++ b/marimo/_utils/tmpdir.py@@ -1,4 +1,6 @@# Copyright 2024 Marimo. All rights reserved.+from __future__ import annotations+import osimport sysimport tempfilediff --git a/marimo/_utils/uv.py b/marimo/_utils/uv.pyindex 4e79b7f2d2..f2b948e49a 100644--- a/marimo/_utils/uv.py+++ b/marimo/_utils/uv.py@@ -1,4 +1,6 @@# Copyright 2025 Marimo. All rights reserved.+from __future__ import annotations+import os