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: accept a covariant Mapping in tabs, accordion, and routes (#10712)
Kiran Gadhaveca9b8c9d39c6
diff --git a/marimo/_plugins/stateless/accordion.py b/marimo/_plugins/stateless/accordion.pyindex eddb1dfa0b..e706943528 100644--- a/marimo/_plugins/stateless/accordion.py+++ b/marimo/_plugins/stateless/accordion.py@@ -1,6 +1,8 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations+from typing import TYPE_CHECKING+from marimo._output.formatting import as_htmlfrom marimo._output.hypertext import ContainerHtml, Htmlfrom marimo._output.md import md@@ -8,13 +10,16 @@ from marimo._output.rich_help import mddocfrom marimo._plugins.core.web_component import build_stateless_pluginfrom marimo._plugins.stateless.lazy import lazy as lazy_ui+if TYPE_CHECKING:+ from collections.abc import Mapping+@mddocclass accordion(ContainerHtml):"""An `Html` object representing an accordion of one or more items.Args:- items: a dictionary of item names to item content; strings are+ items: a mapping of item names to item content; strings areinterpreted as markdownmultiple: whether to allow multiple items to be open simultaneouslylazy: a boolean, whether to lazily load the accordion content.@@ -40,7 +45,7 @@ class accordion(ContainerHtml):def __init__(self,- items: dict[str, object],+ items: Mapping[str, object],multiple: bool = False,lazy: bool = False,) -> None:diff --git a/marimo/_plugins/stateless/routes.py b/marimo/_plugins/stateless/routes.pyindex c7b1387029..62f2d92297 100644--- a/marimo/_plugins/stateless/routes.py+++ b/marimo/_plugins/stateless/routes.py@@ -10,7 +10,7 @@ from marimo._plugins.stateless import lazyfrom marimo._plugins.ui._core.ui_element import UIElementif TYPE_CHECKING:- from collections.abc import Callable, Coroutine+ from collections.abc import Callable, Coroutine, Mapping@mddoc@@ -40,8 +40,8 @@ class routes(UIElement[str, str]):```Args:- routes (dict[str, Union[Callable[[], object], Callable[[], Coroutine[None, None, object]], object]]):- A dictionary of routes, where the key is the URL path and the value is a function+ routes (Mapping[str, Union[Callable[[], object], Callable[[], Coroutine[None, None, object]], object]]):+ A mapping of routes, where the key is the URL path and the value is a functionthat returns the content to display.Returns:@@ -55,7 +55,7 @@ class routes(UIElement[str, str]):def __init__(self,- routes: dict[+ routes: Mapping[str,Callable[[], object]| Callable[[], Coroutine[None, None, object]]diff --git a/marimo/_plugins/stateless/tabs.py b/marimo/_plugins/stateless/tabs.pyindex 39147a3cde..a44ad6f3af 100644--- a/marimo/_plugins/stateless/tabs.py+++ b/marimo/_plugins/stateless/tabs.py@@ -1,21 +1,26 @@# Copyright 2026 Marimo. All rights reserved.from __future__ import annotations+from typing import TYPE_CHECKING+from marimo._output.hypertext import Htmlfrom marimo._output.rich_help import mddocfrom marimo._plugins.ui._impl.tabs import tabs as tabs_implfrom marimo._utils.deprecated import deprecated+if TYPE_CHECKING:+ from collections.abc import Mapping+@mddoc@deprecated("mo.tabs is deprecated. Use mo.ui.tabs instead")-def tabs(tabs: dict[str, object]) -> Html:+def tabs(tabs: Mapping[str, object]) -> Html:"""Deprecated: Use `mo.ui.tabs` instead.Tabs of UI elements.Args:- tabs: a dictionary of tab names to tab content; strings are interpreted+ tabs: a mapping of tab names to tab content; strings are interpretedas markdownReturns:diff --git a/marimo/_plugins/ui/_impl/tabs.py b/marimo/_plugins/ui/_impl/tabs.pyindex 1f2c993b60..e3764ee923 100644--- a/marimo/_plugins/ui/_impl/tabs.py+++ b/marimo/_plugins/ui/_impl/tabs.py@@ -11,7 +11,7 @@ from marimo._plugins.stateless.lazy import lazy as lazy_uifrom marimo._plugins.ui._core.ui_element import UIElementif TYPE_CHECKING:- from collections.abc import Callable+ from collections.abc import Callable, Mapping@mddoc@@ -54,7 +54,7 @@ class tabs(UIElement[str, str]):value (str): The name of the selected tab.Args:- tabs (dict[str, object]): A dictionary of tab names to tab content; strings+ tabs (Mapping[str, object]): A mapping of tab names to tab content; stringsare interpreted as markdown.value (str, optional): The name of the tab to open. Defaults to the first tab.lazy (bool, optional): Whether to lazily load the tab content.@@ -71,7 +71,7 @@ class tabs(UIElement[str, str]):def __init__(self,- tabs: dict[str, object],+ tabs: Mapping[str, object],value: str | None = None,lazy: bool = False,*,diff --git a/marimo/_utils/deprecated.py b/marimo/_utils/deprecated.pyindex f9c9157048..8d0e38f5ff 100644--- a/marimo/_utils/deprecated.py+++ b/marimo/_utils/deprecated.py@@ -3,25 +3,28 @@ from __future__ import annotationsimport functoolsimport warnings-from typing import TYPE_CHECKING, Any+from typing import TYPE_CHECKING, ParamSpec, TypeVarif TYPE_CHECKING:from collections.abc import Callable+P = ParamSpec("P")+R = TypeVar("R")-def deprecated(reason: str) -> Callable[[Any], Any]:++def deprecated(reason: str) -> Callable[[Callable[P, R]], Callable[P, R]]:"""A decorator that emits a deprecation warning."""- def decorator(func: Callable[[Any], Any]) -> Callable[[Any], Any]:+ def decorator(func: Callable[P, R]) -> Callable[P, R]:@functools.wraps(func)- def wrapper(*args: Any, **kwargs: Any) -> Callable[[Any], Any]:+ def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:# stacklevel=2 shows the line number in the call sitewarnings.warn(message=reason,category=DeprecationWarning,stacklevel=2,)- return func(*args, **kwargs) # type: ignore[no-any-return]+ return func(*args, **kwargs)return wrapperdiff --git a/tests/_ast/test_app_typing.py b/tests/_ast/test_app_typing.pyindex 8ddd312528..76e92ca718 100644--- a/tests/_ast/test_app_typing.py+++ b/tests/_ast/test_app_typing.py@@ -268,3 +268,47 @@ class TestDictionaryTyping:_cloned = validate_and_clone(checks)""")+++class TestContainerTyping:+ # dict is invariant, so a dict[str, Html] was rejected for the old+ # dict[str, object] params; widening them to a covariant Mapping accepts+ # a dict of any value type. Regression guard for #10631.+ def test_tabs_accepts_covariant_dict(self) -> None:+ _check_pyright(+ _PREAMBLE+ + """+ panes: dict[str, mo.Html] = {"a": mo.md("x")}+ t = mo.ui.tabs(panes)+ assert_type(t.value, str)+"""+ )++ def test_accordion_accepts_covariant_dict(self) -> None:+ _check_pyright(+ _PREAMBLE+ + """+ panes: dict[str, mo.Html] = {"a": mo.md("x")}+ assert_type(mo.accordion(panes), mo.accordion)+"""+ )++ def test_deprecated_tabs_accepts_covariant_dict(self) -> None:+ _check_pyright(+ _PREAMBLE+ + """+ panes: dict[str, mo.Html] = {"a": mo.md("x")}+ assert_type(mo.tabs(panes), mo.Html)+"""+ )++ def test_routes_accepts_covariant_dict(self) -> None:+ _check_pyright(+ _PREAMBLE+ + """+ from collections.abc import Callable++ pages: dict[str, Callable[[], mo.Html]] = {"#/": lambda: mo.md("x")}+ assert_type(mo.routes(pages), mo.routes)+"""+ )