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.

chore: bump ruff target-version to py310 (#9118)

Kiran Gadhave2da597f96dc6
diff --git a/marimo/_ai/_pydantic_ai_utils.py b/marimo/_ai/_pydantic_ai_utils.py
index d38a9ba6ca..795eb89ec3 100644
--- a/marimo/_ai/_pydantic_ai_utils.py
+++ b/marimo/_ai/_pydantic_ai_utils.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import uuid
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo import _loggers
from marimo._messaging.msgspec_encoder import asdict
@@ -12,6 +12,8 @@ from marimo._server.models.completion import UIMessage as ServerUIMessage
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from pydantic_ai import FunctionToolset
from pydantic_ai.ui.vercel_ai.request_types import UIMessage, UIMessagePart
diff --git a/marimo/_ai/_tools/base.py b/marimo/_ai/_tools/base.py
index 7462d66484..2d9ccebefb 100644
--- a/marimo/_ai/_tools/base.py
+++ b/marimo/_ai/_tools/base.py
@@ -7,7 +7,6 @@ from dataclasses import asdict, dataclass, is_dataclass
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Generic,
Optional,
TypeVar,
@@ -50,7 +49,7 @@ ArgsP = TypeVar("ArgsP", contravariant=True)
OutC = TypeVar("OutC", covariant=True)
if TYPE_CHECKING:
- from collections.abc import Awaitable
+ from collections.abc import Awaitable, Callable
from starlette.applications import Starlette
diff --git a/marimo/_ai/llm/_impl.py b/marimo/_ai/llm/_impl.py
index f036716304..a243db5c32 100644
--- a/marimo/_ai/llm/_impl.py
+++ b/marimo/_ai/llm/_impl.py
@@ -5,7 +5,7 @@ import dataclasses
import json
import os
import re
-from typing import TYPE_CHECKING, Any, Callable, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
from marimo import _loggers
from marimo._ai._pydantic_ai_utils import generate_id
@@ -13,7 +13,7 @@ from marimo._plugins.ui._impl.chat.chat import AI_SDK_VERSION, DONE_CHUNK
from marimo._utils.dicts import remove_none_values
if TYPE_CHECKING:
- from collections.abc import AsyncGenerator, Generator
+ from collections.abc import AsyncGenerator, Callable, Generator
from pydantic_ai import Agent
from pydantic_ai.settings import ModelSettings
diff --git a/marimo/_ast/app.py b/marimo/_ast/app.py
index 68d631be6a..0748df6243 100644
--- a/marimo/_ast/app.py
+++ b/marimo/_ast/app.py
@@ -7,6 +7,7 @@ import os
import sys
import threading
from collections.abc import (
+ Callable,
Iterable,
Iterator,
Mapping,
@@ -18,7 +19,6 @@ from textwrap import dedent
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Literal,
Optional,
ParamSpec,
@@ -69,8 +69,9 @@ from marimo._types.ids import CellId_t
if TYPE_CHECKING:
from collections.abc import Sequence
from types import FrameType, TracebackType
+ from typing import TypeGuard
- from typing_extensions import TypeGuard, TypeIs
+ from typing_extensions import TypeIs
from marimo._messaging.notification import HumanReadableStatus
from marimo._plugins.core.web_component import JSONType
@@ -292,6 +293,7 @@ class App:
self._cell_manager.codes(),
self._cell_manager.names(),
self._cell_manager.configs(),
+ strict=False,
):
cell = None
cell_data = self._cell_manager._cell_data.get(cell_id)
@@ -1011,7 +1013,7 @@ class InternalApp:
) -> InternalApp:
new_cell_manager = CellManager()
for cell_id, code, name, config in zip(
- cell_ids, codes, names, configs
+ cell_ids, codes, names, configs, strict=False
):
cell = None
# If the cell exists, the cell data should be set.
diff --git a/marimo/_ast/cell.py b/marimo/_ast/cell.py
index 08c3e95fcf..d172d7af7e 100644
--- a/marimo/_ast/cell.py
+++ b/marimo/_ast/cell.py
@@ -678,7 +678,9 @@ class Cell:
arg_names = sorted((self._cell.refs - allowed_refs) - self._cell.defs)
argc = len(arg_names)
- call_args = {name: arg for name, arg in zip(arg_names, args)}
+ call_args = {
+ name: arg for name, arg in zip(arg_names, args, strict=False)
+ }
call_args.update(kwargs)
call_argc = len(call_args.keys()) + len(self._pytest_reserved)
diff --git a/marimo/_ast/cell_manager.py b/marimo/_ast/cell_manager.py
index 1712b46ca5..0da223529f 100644
--- a/marimo/_ast/cell_manager.py
+++ b/marimo/_ast/cell_manager.py
@@ -2,9 +2,9 @@
from __future__ import annotations
import os
+from collections.abc import Callable
from typing import (
TYPE_CHECKING,
- Callable,
Optional,
ParamSpec,
TypeAlias,
diff --git a/marimo/_ast/compiler.py b/marimo/_ast/compiler.py
index f2779f25ca..77975c8221 100644
--- a/marimo/_ast/compiler.py
+++ b/marimo/_ast/compiler.py
@@ -14,7 +14,7 @@ import token as token_types
import warnings
from tokenize import TokenError, tokenize
from types import CodeType, FrameType
-from typing import Any, Callable, Optional, TypeAlias, cast
+from typing import TYPE_CHECKING, Any, Optional, TypeAlias, cast
from marimo import _loggers
from marimo._ast import parse
@@ -33,6 +33,9 @@ from marimo._schemas.serialization import CellDef, ClassCell, FunctionCell
from marimo._types.ids import CellId_t
from marimo._utils.tmpdir import get_tmpdir
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
Cls: TypeAlias = type
diff --git a/marimo/_ast/parse.py b/marimo/_ast/parse.py
index 044f402349..68a76f05ff 100644
--- a/marimo/_ast/parse.py
+++ b/marimo/_ast/parse.py
@@ -33,8 +33,7 @@ from marimo._schemas.serialization import (
if TYPE_CHECKING:
from collections.abc import Iterator
-
- from typing_extensions import TypeAlias
+ from typing import TypeAlias
FnNode: TypeAlias = Union[ast.FunctionDef, ast.AsyncFunctionDef]
@@ -898,7 +897,9 @@ def is_equal_ast(
assert isinstance(other, list)
if len(basis) != len(other):
return False
- return all(is_equal_ast(a, b) for a, b in zip(basis, other))
+ return all(
+ is_equal_ast(a, b) for a, b in zip(basis, other, strict=False)
+ )
for key, value in vars(basis).items():
# Scrub positional data not relevant for comparison.
diff --git a/marimo/_ast/pytest.py b/marimo/_ast/pytest.py
index 78a1d8fbb9..d644212523 100644
--- a/marimo/_ast/pytest.py
+++ b/marimo/_ast/pytest.py
@@ -6,9 +6,9 @@ import copy
import functools
import inspect
import itertools
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, NoReturn, TypeVar, cast
+from typing import TYPE_CHECKING, Any, NoReturn, TypeVar, cast
from marimo._ast.cell import Cell
from marimo._ast.fast_stack import fast_stack
diff --git a/marimo/_ast/toplevel.py b/marimo/_ast/toplevel.py
index c6c8801d98..55c3e46d59 100644
--- a/marimo/_ast/toplevel.py
+++ b/marimo/_ast/toplevel.py
@@ -261,7 +261,7 @@ class TopLevelExtraction:
# Run through and get defs + refs, and a naive attempt at resolving cell
# status.
for idx, (code, name, config) in enumerate(
- zip(codes, names, cell_configs)
+ zip(codes, names, cell_configs, strict=False)
):
status = TopLevelStatus(
CellId_t(str(idx)), code, name, config, self.allowed_refs
diff --git a/marimo/_ast/transformers.py b/marimo/_ast/transformers.py
index a2dbbbb070..5f879bb9ec 100644
--- a/marimo/_ast/transformers.py
+++ b/marimo/_ast/transformers.py
@@ -4,13 +4,13 @@ from __future__ import annotations
import ast
import inspect
import textwrap
-from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Optional, TypeVar, cast
from marimo._ast.parse import ast_parse
from marimo._ast.variables import unmangle_local
if TYPE_CHECKING:
- from collections.abc import Sequence
+ from collections.abc import Callable, Sequence
ARG_PREFIX: str = "*"
diff --git a/marimo/_ast/visitor.py b/marimo/_ast/visitor.py
index 8423b2ab87..d35c2f25ca 100644
--- a/marimo/_ast/visitor.py
+++ b/marimo/_ast/visitor.py
@@ -7,7 +7,7 @@ from collections import defaultdict
from copy import deepcopy
from dataclasses import dataclass, field
from functools import lru_cache
-from typing import Callable, Literal, Optional, Union
+from typing import TYPE_CHECKING, Literal, Optional, Union
from uuid import uuid4
from marimo import _loggers
@@ -25,6 +25,9 @@ from marimo._dependencies.dependencies import DependencyManager
from marimo._sql.error_utils import log_sql_error
from marimo._utils.strings import standardize_annotation_quotes
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_cli/export/commands.py b/marimo/_cli/export/commands.py
index 8e904ef2c4..871948f743 100644
--- a/marimo/_cli/export/commands.py
+++ b/marimo/_cli/export/commands.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
from pathlib import Path
-from typing import Callable, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional
import click
@@ -39,6 +39,9 @@ from marimo._utils.file_watcher import FileWatcher
from marimo._utils.marimo_path import MarimoPath
from marimo._utils.paths import maybe_make_dirs
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
_watch_message = (
"Watch notebook for changes and regenerate the output on modification. "
"If watchdog is installed, it will be used to watch the file. "
diff --git a/marimo/_cli/upgrade.py b/marimo/_cli/upgrade.py
index 0098e7a5e5..4e445e278e 100644
--- a/marimo/_cli/upgrade.py
+++ b/marimo/_cli/upgrade.py
@@ -5,7 +5,7 @@ import json
import os
import urllib.error
from datetime import datetime
-from typing import Any, Callable, cast
+from typing import TYPE_CHECKING, Any, cast
import marimo._utils.requests as requests
from marimo import _loggers
@@ -19,6 +19,9 @@ from marimo._config.cli_state import (
from marimo._tracer import server_tracer
from marimo._version import __version__ as current_version
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
FETCH_TIMEOUT = 3
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_code_mode/_context.py b/marimo/_code_mode/_context.py
index 9a342e0b32..f8c8e4869a 100644
--- a/marimo/_code_mode/_context.py
+++ b/marimo/_code_mode/_context.py
@@ -647,7 +647,7 @@ class AsyncCodeModeContext:
# Flush queued UI updates as a single batch.
if ui_updates:
- object_ids, values = zip(*ui_updates)
+ object_ids, values = zip(*ui_updates, strict=False)
await self._kernel.set_ui_element_value(
UpdateUIElementCommand(
object_ids=list(object_ids),
diff --git a/marimo/_convert/common/comment_preserver.py b/marimo/_convert/common/comment_preserver.py
index c95e4867a4..8f26891c0e 100644
--- a/marimo/_convert/common/comment_preserver.py
+++ b/marimo/_convert/common/comment_preserver.py
@@ -5,7 +5,10 @@ import io
import token as token_types
from dataclasses import dataclass
from tokenize import TokenError, tokenize
-from typing import Callable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
@dataclass
@@ -97,7 +100,7 @@ class CommentPreserver:
result = []
for i, (original, transformed) in enumerate(
- zip(original_sources, transformed_sources)
+ zip(original_sources, transformed_sources, strict=False)
):
comments = self.comments_by_source.get(i, [])
if not comments:
diff --git a/marimo/_convert/common/dom_traversal.py b/marimo/_convert/common/dom_traversal.py
index 62656bc57b..ed24b27c68 100644
--- a/marimo/_convert/common/dom_traversal.py
+++ b/marimo/_convert/common/dom_traversal.py
@@ -5,13 +5,16 @@ import base64
import mimetypes
import re
from html.parser import HTMLParser
-from typing import Callable, Optional, cast
+from typing import TYPE_CHECKING, Optional, cast
from marimo import _loggers
from marimo._messaging.mimetypes import KnownMimeType
from marimo._runtime.virtual_file import read_virtual_file
from marimo._utils.data_uri import build_data_url
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_convert/ipynb/to_ir.py b/marimo/_convert/ipynb/to_ir.py
index a75f0336e2..66bbbca47a 100644
--- a/marimo/_convert/ipynb/to_ir.py
+++ b/marimo/_convert/ipynb/to_ir.py
@@ -7,8 +7,9 @@ import logging
import re
import sys
from collections import defaultdict
+from collections.abc import Callable
from dataclasses import dataclass, field
-from typing import Any, Callable, Union
+from typing import Any, Union
from pymdownx.superfences import RE_NESTED_FENCE_START # type: ignore
@@ -1274,7 +1275,9 @@ def bind_cell_metadata(
- If marimo-specific metadata is present, it is used to restore cell config.
"""
cells: list[CodeCell] = []
- for source, meta, hide_code in zip(sources, metadata, hide_flags):
+ for source, meta, hide_code in zip(
+ sources, metadata, hide_flags, strict=False
+ ):
tags: set[str] = set(meta.get("tags", []))
# Extract marimo-specific cell config if present
diff --git a/marimo/_convert/markdown/to_ir.py b/marimo/_convert/markdown/to_ir.py
index 0cf787c09e..36e4586ac3 100644
--- a/marimo/_convert/markdown/to_ir.py
+++ b/marimo/_convert/markdown/to_ir.py
@@ -4,8 +4,8 @@ from __future__ import annotations
import re
from dataclasses import dataclass
from typing import (
+ TYPE_CHECKING,
Any,
- Callable,
Generic,
Literal,
Optional,
@@ -42,6 +42,9 @@ from marimo._schemas.serialization import (
NotebookSerializationV1,
)
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
MARIMO_MD = "marimo-md"
@@ -241,7 +244,9 @@ def _tree_to_ir(root: Element) -> SafeWrap[NotebookSerializationV1]:
code=source,
options=config.asdict(),
)
- for name, source, config in zip(names, sources, cell_config)
+ for name, source, config in zip(
+ names, sources, cell_config, strict=False
+ )
],
header=Header(value=header_value) if header_value else None,
)
diff --git a/marimo/_data/get_datasets.py b/marimo/_data/get_datasets.py
index 0c8cb4cd66..a7d54907cb 100644
--- a/marimo/_data/get_datasets.py
+++ b/marimo/_data/get_datasets.py
@@ -239,6 +239,7 @@ def _get_databases_from_duckdb_internal(
for column_name, column_type in zip(
cast(list[str], column_names),
cast(list[str], column_types),
+ strict=False,
)
]
diff --git a/marimo/_lint/diagnostic.py b/marimo/_lint/diagnostic.py
index f73a464516..3b988c7456 100644
--- a/marimo/_lint/diagnostic.py
+++ b/marimo/_lint/diagnostic.py
@@ -79,5 +79,7 @@ class Diagnostic:
# mypy seems unable to infer the type
return cast(
tuple[tuple[int], tuple[int]],
- tuple(zip(*sorted(zip(lines, columns)))),
+ tuple(
+ zip(*sorted(zip(lines, columns, strict=False)), strict=False)
+ ),
)
diff --git a/marimo/_lint/formatters/full.py b/marimo/_lint/formatters/full.py
index 054649283f..085adb6a13 100644
--- a/marimo/_lint/formatters/full.py
+++ b/marimo/_lint/formatters/full.py
@@ -63,7 +63,7 @@ class FullFormatter(DiagnosticFormatter):
context_lines = []
previous_line = -1
- for line, column in zip(lines, columns):
+ for line, column in zip(lines, columns, strict=False):
line += 1 # Convert to 1-based index
# Show context: 1 line above, current line, 1 line below
start_line = max(1, line - 1)
diff --git a/marimo/_lint/rules/runtime/reusable_definition_order.py b/marimo/_lint/rules/runtime/reusable_definition_order.py
index 7d2accd2fe..86a7285e8b 100644
--- a/marimo/_lint/rules/runtime/reusable_definition_order.py
+++ b/marimo/_lint/rules/runtime/reusable_definition_order.py
@@ -132,7 +132,7 @@ class ReusableDefinitionOrderRule(UnsafeFixRule):
extraction, notebook_indices = self._extract_notebook(ctx.notebook)
for status, notebook_index in zip(
- extraction.statuses, notebook_indices
+ extraction.statuses, notebook_indices, strict=False
):
if not (
status.hint
@@ -180,7 +180,7 @@ class ReusableDefinitionOrderRule(UnsafeFixRule):
sorted_provider_positions = sorted(provider_order)
reordered_provider_cells = [cells[index] for index in provider_order]
for provider_position, cell in zip(
- sorted_provider_positions, reordered_provider_cells
+ sorted_provider_positions, reordered_provider_cells, strict=False
):
cells[provider_position] = cell
@@ -192,7 +192,7 @@ class ReusableDefinitionOrderRule(UnsafeFixRule):
provider_indices = {
self._get_definition_name(status): notebook_index
for status, notebook_index in zip(
- extraction.statuses, notebook_indices
+ extraction.statuses, notebook_indices, strict=False
)
if status.is_toplevel
or (
@@ -210,7 +210,7 @@ class ReusableDefinitionOrderRule(UnsafeFixRule):
indegree = {notebook_index: 0 for notebook_index in graph}
for status, notebook_index in zip(
- extraction.statuses, notebook_indices
+ extraction.statuses, notebook_indices, strict=False
):
if not (
status.is_toplevel
diff --git a/marimo/_mcp/server/_prompts/base.py b/marimo/_mcp/server/_prompts/base.py
index 7be49b5838..76f834a5c2 100644
--- a/marimo/_mcp/server/_prompts/base.py
+++ b/marimo/_mcp/server/_prompts/base.py
@@ -4,11 +4,13 @@
from __future__ import annotations
from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
from marimo._utils.case import to_snake_case
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from mcp.types import PromptMessage
from marimo._ai._tools.base import ToolContext
diff --git a/marimo/_metadata/opengraph.py b/marimo/_metadata/opengraph.py
index f6b4d2cfa1..2746a32799 100644
--- a/marimo/_metadata/opengraph.py
+++ b/marimo/_metadata/opengraph.py
@@ -6,9 +6,10 @@ import asyncio
import importlib
import inspect
import re
+from collections.abc import Callable
from dataclasses import dataclass
from pathlib import Path
-from typing import Any, Callable, Literal, cast
+from typing import Any, Literal, cast
from urllib.parse import urlparse
import msgspec
diff --git a/marimo/_output/formatters/bokeh_formatters.py b/marimo/_output/formatters/bokeh_formatters.py
index e545c973ad..0da5c79cd5 100644
--- a/marimo/_output/formatters/bokeh_formatters.py
+++ b/marimo/_output/formatters/bokeh_formatters.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import functools
-from typing import Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo._config.config import Theme
from marimo._messaging.mimetypes import KnownMimeType
@@ -11,6 +11,9 @@ from marimo._output.formatters.formatter_factory import FormatterFactory
from marimo._output.formatters.utils import src_or_src_doc
from marimo._output.utils import flatten_string
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
class BokehFormatter(FormatterFactory):
@staticmethod
diff --git a/marimo/_output/formatters/formatter_factory.py b/marimo/_output/formatters/formatter_factory.py
index 17fbc9edf1..1fdce82d05 100644
--- a/marimo/_output/formatters/formatter_factory.py
+++ b/marimo/_output/formatters/formatter_factory.py
@@ -2,7 +2,8 @@
from __future__ import annotations
import abc
-from typing import Callable, Optional
+from collections.abc import Callable
+from typing import Optional
from marimo import _loggers
from marimo._config.config import Theme
diff --git a/marimo/_output/formatters/formatters.py b/marimo/_output/formatters/formatters.py
index dda041280b..e22a753ce4 100644
--- a/marimo/_output/formatters/formatters.py
+++ b/marimo/_output/formatters/formatters.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import sys
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo import _loggers
from marimo._config.config import Theme
@@ -44,7 +44,7 @@ from marimo._utils.site_packages import is_local_module
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from collections.abc import Sequence
+ from collections.abc import Callable, Sequence
# Map from formatter factory's package name to formatter, for third-party
# modules. These formatters will be registered if and when their associated
diff --git a/marimo/_output/formatters/ipython_formatters.py b/marimo/_output/formatters/ipython_formatters.py
index 8e98884d27..4f87cb40dd 100644
--- a/marimo/_output/formatters/ipython_formatters.py
+++ b/marimo/_output/formatters/ipython_formatters.py
@@ -3,13 +3,16 @@ from __future__ import annotations
import functools
from dataclasses import dataclass
-from typing import Any, Callable, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
from marimo._messaging.mimetypes import KnownMimeType
from marimo._output.builder import h
from marimo._output.formatters.formatter_factory import FormatterFactory
from marimo._plugins.core.media import io_to_data_url
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
class IPythonFormatter(FormatterFactory):
@staticmethod
diff --git a/marimo/_output/formatters/repr_formatters.py b/marimo/_output/formatters/repr_formatters.py
index 4cc359de65..207f809fbb 100644
--- a/marimo/_output/formatters/repr_formatters.py
+++ b/marimo/_output/formatters/repr_formatters.py
@@ -1,13 +1,16 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
from marimo._messaging.mimetypes import KnownMimeType
from marimo._output.formatters.iframe import maybe_wrap_in_iframe
from marimo._plugins.core.media import io_to_data_url
from marimo._utils.methods import is_callable_method
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
_WIDGET_VIEW_KEY = "application/vnd.jupyter.widget-view+json"
MEDIA_MIME_PREFIXES = (
diff --git a/marimo/_output/formatting.py b/marimo/_output/formatting.py
index cac161002a..ffbc543d07 100644
--- a/marimo/_output/formatting.py
+++ b/marimo/_output/formatting.py
@@ -19,9 +19,10 @@ from __future__ import annotations
import json
import traceback
+from collections.abc import Callable
from dataclasses import dataclass
from html import escape
-from typing import Any, Callable, Optional, TypeVar, cast
+from typing import Any, Optional, TypeVar, cast
from marimo import _loggers as loggers
from marimo._messaging.mimetypes import KnownMimeType
diff --git a/marimo/_output/rich_help.py b/marimo/_output/rich_help.py
index 35301014c4..4f87e20331 100644
--- a/marimo/_output/rich_help.py
+++ b/marimo/_output/rich_help.py
@@ -2,9 +2,9 @@
from __future__ import annotations
import inspect
+from collections.abc import Callable
from typing import (
Any,
- Callable,
Generic,
Optional,
Protocol,
diff --git a/marimo/_plugins/stateless/download.py b/marimo/_plugins/stateless/download.py
index fdc0b39af9..80af49438c 100644
--- a/marimo/_plugins/stateless/download.py
+++ b/marimo/_plugins/stateless/download.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import asyncio
import io
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Final, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Final, Optional, Union, cast
import marimo._output.data.data as mo_data
from marimo._output.rich_help import mddoc
@@ -18,7 +18,7 @@ from marimo._plugins.ui._core.ui_element import UIElement
from marimo._runtime.functions import EmptyArgs, Function
if TYPE_CHECKING:
- from collections.abc import Coroutine
+ from collections.abc import Callable, Coroutine
DataType = Union[str, bytes, io.BytesIO, io.BufferedReader]
diff --git a/marimo/_plugins/stateless/lazy.py b/marimo/_plugins/stateless/lazy.py
index dc4e0242b2..be4051bdf0 100644
--- a/marimo/_plugins/stateless/lazy.py
+++ b/marimo/_plugins/stateless/lazy.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Callable, Final, Union
+from typing import TYPE_CHECKING, Final, Union
from marimo._output.formatting import as_html
from marimo._output.rich_help import mddoc
@@ -11,7 +11,7 @@ from marimo._plugins.ui._core.ui_element import UIElement
from marimo._runtime.functions import EmptyArgs, Function
if TYPE_CHECKING:
- from collections.abc import Coroutine
+ from collections.abc import Callable, Coroutine
@dataclass
diff --git a/marimo/_plugins/stateless/routes.py b/marimo/_plugins/stateless/routes.py
index 2ef0aa51ba..d7146bda1a 100644
--- a/marimo/_plugins/stateless/routes.py
+++ b/marimo/_plugins/stateless/routes.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Callable, Final, Union
+from typing import TYPE_CHECKING, Any, Final, Union
from marimo._output.formatting import as_html
from marimo._output.hypertext import Html
@@ -10,7 +10,7 @@ from marimo._plugins.stateless import lazy
from marimo._plugins.ui._core.ui_element import UIElement
if TYPE_CHECKING:
- from collections.abc import Coroutine
+ from collections.abc import Callable, Coroutine
@mddoc
diff --git a/marimo/_plugins/ui/_core/ui_element.py b/marimo/_plugins/ui/_core/ui_element.py
index 9113804bea..e1f1d48aad 100644
--- a/marimo/_plugins/ui/_core/ui_element.py
+++ b/marimo/_plugins/ui/_core/ui_element.py
@@ -13,7 +13,6 @@ from html import escape
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Generic,
Optional,
TypeVar,
@@ -34,7 +33,7 @@ from marimo._runtime.functions import Function
from marimo._types.ids import UIElementId
if TYPE_CHECKING:
- from collections.abc import Sequence
+ from collections.abc import Callable, Sequence
from marimo._plugins.ui._impl.input import form as form_plugin
diff --git a/marimo/_plugins/ui/_impl/altair_chart.py b/marimo/_plugins/ui/_impl/altair_chart.py
index cb18c2627e..1a24481bcd 100644
--- a/marimo/_plugins/ui/_impl/altair_chart.py
+++ b/marimo/_plugins/ui/_impl/altair_chart.py
@@ -7,7 +7,6 @@ import sys
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Literal,
Optional,
@@ -41,6 +40,8 @@ from marimo._utils.narwhals_utils import (
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
+ from collections.abc import Callable
+
import altair
import altair.vegalite
from narwhals import Schema
diff --git a/marimo/_plugins/ui/_impl/array.py b/marimo/_plugins/ui/_impl/array.py
index 9b7fe5eb68..fd692562ba 100644
--- a/marimo/_plugins/ui/_impl/array.py
+++ b/marimo/_plugins/ui/_impl/array.py
@@ -1,8 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from collections.abc import Iterator, Sequence
-from typing import Any, Callable, Final, Optional
+from collections.abc import Callable, Iterator, Sequence
+from typing import Any, Final, Optional
from marimo._output.formatters.structures import format_structure
from marimo._output.hypertext import Html
diff --git a/marimo/_plugins/ui/_impl/batch.py b/marimo/_plugins/ui/_impl/batch.py
index c785a26d31..97da4adc51 100644
--- a/marimo/_plugins/ui/_impl/batch.py
+++ b/marimo/_plugins/ui/_impl/batch.py
@@ -4,7 +4,6 @@ from __future__ import annotations
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Optional,
TypeVar,
@@ -16,7 +15,7 @@ from marimo._plugins.core.web_component import JSONType
from marimo._plugins.ui._core.ui_element import UIElement
if TYPE_CHECKING:
- from collections.abc import ItemsView, Iterator, ValuesView
+ from collections.abc import Callable, ItemsView, Iterator, ValuesView
U = TypeVar("U")
V = TypeVar("V")
diff --git a/marimo/_plugins/ui/_impl/chat/chat.py b/marimo/_plugins/ui/_impl/chat/chat.py
index c07c5dc13f..006e1465ed 100644
--- a/marimo/_plugins/ui/_impl/chat/chat.py
+++ b/marimo/_plugins/ui/_impl/chat/chat.py
@@ -5,7 +5,7 @@ import inspect
import json
import uuid
from dataclasses import dataclass
-from typing import Any, Callable, Final, Literal, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Final, Literal, Optional, Union, cast
from marimo import _loggers
from marimo._ai._types import (
@@ -24,6 +24,9 @@ from marimo._runtime.context import get_context
from marimo._runtime.context.types import ContextNotInitializedError
from marimo._runtime.functions import EmptyArgs, Function
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
DEFAULT_CONFIG = ChatModelConfigDict(
diff --git a/marimo/_plugins/ui/_impl/comm.py b/marimo/_plugins/ui/_impl/comm.py
index d52b2b6708..5d2908673d 100644
--- a/marimo/_plugins/ui/_impl/comm.py
+++ b/marimo/_plugins/ui/_impl/comm.py
@@ -1,8 +1,9 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from collections.abc import Callable
from dataclasses import dataclass, field
-from typing import Any, Callable, Optional
+from typing import Any, Optional
from marimo._loggers import marimo_logger
from marimo._messaging.notification import (
diff --git a/marimo/_plugins/ui/_impl/data_editor.py b/marimo/_plugins/ui/_impl/data_editor.py
index 15ce9b8933..c5ca3fc72d 100644
--- a/marimo/_plugins/ui/_impl/data_editor.py
+++ b/marimo/_plugins/ui/_impl/data_editor.py
@@ -8,7 +8,6 @@ from dataclasses import dataclass
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Literal,
Optional,
@@ -30,6 +29,8 @@ from marimo._utils.deprecated import deprecated
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from narwhals.dtypes import DType
from typing_extensions import TypeIs
diff --git a/marimo/_plugins/ui/_impl/data_explorer.py b/marimo/_plugins/ui/_impl/data_explorer.py
index c654b3cb1a..4bb60096ba 100644
--- a/marimo/_plugins/ui/_impl/data_explorer.py
+++ b/marimo/_plugins/ui/_impl/data_explorer.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Callable, Final, Optional
+from typing import TYPE_CHECKING, Any, Final, Optional
import marimo._output.data.data as mo_data
from marimo._dependencies.dependencies import DependencyManager
@@ -10,6 +10,8 @@ from marimo._plugins.ui._core.ui_element import UIElement
from marimo._plugins.ui._impl.tables.utils import get_table_manager
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from narwhals.typing import IntoDataFrame
diff --git a/marimo/_plugins/ui/_impl/dataframes/dataframe.py b/marimo/_plugins/ui/_impl/dataframes/dataframe.py
index 64da6fc72e..c7a1aefd6f 100644
--- a/marimo/_plugins/ui/_impl/dataframes/dataframe.py
+++ b/marimo/_plugins/ui/_impl/dataframes/dataframe.py
@@ -4,8 +4,8 @@ from __future__ import annotations
import sys
from dataclasses import dataclass
from typing import (
+ TYPE_CHECKING,
Any,
- Callable,
Final,
Literal,
Optional,
@@ -56,6 +56,9 @@ from marimo._utils.narwhals_utils import is_narwhals_lazyframe, make_lazy
from marimo._utils.parse_dataclass import parse_raw
from marimo._utils.variable_name import infer_variable_name
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
TOO_MANY_ROWS = 100_000
diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py b/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py
index 24feceb012..0c22fc227b 100644
--- a/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py
+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/handlers.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import datetime
import decimal
from functools import reduce
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
import narwhals.stable.v2 as nw
from narwhals.stable.v2 import col
@@ -42,6 +42,8 @@ from marimo._utils.assert_never import assert_never
from marimo._utils.narwhals_utils import collect_and_preserve_type
if TYPE_CHECKING:
+ from collections.abc import Callable
+
import polars as pl
from narwhals.expr import Expr
from typing_extensions import TypeIs
@@ -457,7 +459,7 @@ class NarwhalsTransformHandler(TransformHandler[DataFrame]):
[
nw.col(on_col) == on_val
for on_col, on_val in zip(
- transform.column_ids, raw_pivot_column
+ transform.column_ids, raw_pivot_column, strict=False
)
],
)
diff --git a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
index a63fd2b738..648f4dc1c4 100644
--- a/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
+++ b/marimo/_plugins/ui/_impl/dataframes/transforms/print_code.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable, Union
+from typing import TYPE_CHECKING, Any, Union
from marimo._plugins.ui._impl.dataframes.transforms.types import (
Condition,
@@ -10,6 +10,9 @@ from marimo._plugins.ui._impl.dataframes.transforms.types import (
)
from marimo._utils.assert_never import assert_never
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
def python_print_transforms(
df_name: str,
diff --git a/marimo/_plugins/ui/_impl/dates.py b/marimo/_plugins/ui/_impl/dates.py
index f89ce13370..6eff750bf7 100644
--- a/marimo/_plugins/ui/_impl/dates.py
+++ b/marimo/_plugins/ui/_impl/dates.py
@@ -3,8 +3,8 @@ from __future__ import annotations
import datetime as dt
from typing import (
+ TYPE_CHECKING,
Any,
- Callable,
Final,
Literal,
Optional,
@@ -21,6 +21,9 @@ from marimo._data.series import (
from marimo._output.rich_help import mddoc
from marimo._plugins.ui._core.ui_element import UIElement
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
Numeric = Union[int, float]
diff --git a/marimo/_plugins/ui/_impl/dictionary.py b/marimo/_plugins/ui/_impl/dictionary.py
index b88954442b..92cfb641fb 100644
--- a/marimo/_plugins/ui/_impl/dictionary.py
+++ b/marimo/_plugins/ui/_impl/dictionary.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo._output.formatters.structures import format_structure
from marimo._output.hypertext import Html
@@ -11,6 +11,9 @@ from marimo._plugins.stateless.json_output import json_output
from marimo._plugins.ui._core.ui_element import UIElement
from marimo._plugins.ui._impl.batch import _batch_base, validate_and_clone
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class dictionary(_batch_base):
diff --git a/marimo/_plugins/ui/_impl/file_browser.py b/marimo/_plugins/ui/_impl/file_browser.py
index b7ff780a63..ddc110b62a 100644
--- a/marimo/_plugins/ui/_impl/file_browser.py
+++ b/marimo/_plugins/ui/_impl/file_browser.py
@@ -1,12 +1,11 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
from dataclasses import dataclass
from pathlib import Path
from typing import (
Any,
- Callable,
Final,
Literal,
Optional,
diff --git a/marimo/_plugins/ui/_impl/input.py b/marimo/_plugins/ui/_impl/input.py
index 6009e8ad09..8b3f68fcbf 100644
--- a/marimo/_plugins/ui/_impl/input.py
+++ b/marimo/_plugins/ui/_impl/input.py
@@ -5,11 +5,10 @@ import base64
import dataclasses
import sys
import traceback
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
from dataclasses import dataclass
from typing import (
Any,
- Callable,
Final,
Literal,
Optional,
diff --git a/marimo/_plugins/ui/_impl/microphone.py b/marimo/_plugins/ui/_impl/microphone.py
index a050a285e6..a7b89fb497 100644
--- a/marimo/_plugins/ui/_impl/microphone.py
+++ b/marimo/_plugins/ui/_impl/microphone.py
@@ -3,11 +3,14 @@ from __future__ import annotations
import base64
import io
-from typing import Callable, Final, Optional
+from typing import TYPE_CHECKING, Final, Optional
from marimo._output.rich_help import mddoc
from marimo._plugins.ui._core.ui_element import UIElement
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class microphone(UIElement[str, io.BytesIO]):
diff --git a/marimo/_plugins/ui/_impl/plotly.py b/marimo/_plugins/ui/_impl/plotly.py
index f3d3e0b052..dae337084a 100644
--- a/marimo/_plugins/ui/_impl/plotly.py
+++ b/marimo/_plugins/ui/_impl/plotly.py
@@ -6,7 +6,6 @@ import numbers
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Optional,
cast,
@@ -23,6 +22,8 @@ from marimo._plugins.ui._core.ui_element import UIElement
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
+ from collections.abc import Callable
+
import plotly.graph_objects as go # type:ignore
# Selection is a dictionary of the form:
@@ -339,7 +340,9 @@ class plotly(UIElement[PlotlySelection, list[dict[str, Any]]]):
y_data = getattr(trace, "y", None)
if x_data is None or y_data is None:
continue
- for point_idx, (x, y) in enumerate(zip(x_data, y_data)):
+ for point_idx, (x, y) in enumerate(
+ zip(x_data, y_data, strict=False)
+ ):
# Early exit if x is not in range
if not (selection.x0 <= x <= selection.x1):
continue
@@ -1035,7 +1038,9 @@ def _extract_scatter_points_fallback(
y_category_positions = _category_position_map(y_data)
# First pass: include points directly inside current selection bounds.
- for point_idx, (x_val, y_val) in enumerate(zip(x_data, y_data)):
+ for point_idx, (x_val, y_val) in enumerate(
+ zip(x_data, y_data, strict=False)
+ ):
x_in_range = False
if _is_orderable_value(x_val) and _is_orderable_value(x_min):
@@ -1195,7 +1200,7 @@ def _extract_scatter_points_from_lasso(
polygon_x: list[float] = []
polygon_y: list[float] = []
- for raw_x, raw_y in zip(lasso_x, lasso_y):
+ for raw_x, raw_y in zip(lasso_x, lasso_y, strict=False):
x_coord = _to_numeric_coord(raw_x)
if x_coord is None:
x_coord = _safe_category_get(x_category_to_index, raw_x, -1)
@@ -1219,7 +1224,9 @@ def _extract_scatter_points_from_lasso(
if not polygon_x:
continue
- for point_idx, (x_val, y_val) in enumerate(zip(x_data, y_data)):
+ for point_idx, (x_val, y_val) in enumerate(
+ zip(x_data, y_data, strict=False)
+ ):
x_coord = _to_numeric_coord(x_val)
if x_coord is None:
try:
@@ -2097,7 +2104,7 @@ def _append_waterfall_bars_to_selection(
return
incoming_index_map = {
id(p): idx
- for idx, p in zip(all_indices, all_points)
+ for idx, p in zip(all_indices, all_points, strict=False)
if p and isinstance(idx, int)
}
clean_indices: list[int] = []
@@ -2316,7 +2323,7 @@ def _append_violin_points_to_selection(
]
existing_non_violin_indices = [
idx
- for idx, p in zip(all_indices, all_points)
+ for idx, p in zip(all_indices, all_points, strict=False)
if p and p.get("curveNumber") not in violin_curve_numbers
]
@@ -2330,7 +2337,9 @@ def _append_violin_points_to_selection(
# recomputing from pointIndex only — Plotly may send pointNumber
# instead. Map each point object to its original index by identity.
incoming_index_map = {
- id(p): idx for idx, p in zip(all_indices, all_points) if p
+ id(p): idx
+ for idx, p in zip(all_indices, all_points, strict=False)
+ if p
}
clean_indices: list[int] = []
for p in clean_points:
@@ -2360,7 +2369,7 @@ def _append_violin_points_to_selection(
merged_indices: list[int] = []
for idx, point in zip(
- existing_non_violin_indices, existing_non_violin
+ existing_non_violin_indices, existing_non_violin, strict=False
):
point_id = _get_selection_point_id(point)
if point_id is not None:
diff --git a/marimo/_plugins/ui/_impl/refresh.py b/marimo/_plugins/ui/_impl/refresh.py
index 25858b5aa0..bd1b90ae8d 100644
--- a/marimo/_plugins/ui/_impl/refresh.py
+++ b/marimo/_plugins/ui/_impl/refresh.py
@@ -1,11 +1,14 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Callable, Final, Optional, Union
+from typing import TYPE_CHECKING, Final, Optional, Union
from marimo._output.rich_help import mddoc
from marimo._plugins.ui._core.ui_element import UIElement
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class refresh(UIElement[int, int]):
diff --git a/marimo/_plugins/ui/_impl/run_button.py b/marimo/_plugins/ui/_impl/run_button.py
index 811984c981..b697e7d142 100644
--- a/marimo/_plugins/ui/_impl/run_button.py
+++ b/marimo/_plugins/ui/_impl/run_button.py
@@ -1,13 +1,16 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable, Final, Literal, Optional
+from typing import TYPE_CHECKING, Any, Final, Literal, Optional
from marimo._output.rich_help import mddoc
from marimo._plugins.ui._core.ui_element import UIElement
from marimo._plugins.ui._impl.input import button
from marimo._runtime.context.types import ContextNotInitializedError
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class run_button(UIElement[Any, Any]):
diff --git a/marimo/_plugins/ui/_impl/switch.py b/marimo/_plugins/ui/_impl/switch.py
index 6012067f6d..439ca9b3fe 100644
--- a/marimo/_plugins/ui/_impl/switch.py
+++ b/marimo/_plugins/ui/_impl/switch.py
@@ -1,11 +1,14 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Callable, Final, Optional
+from typing import TYPE_CHECKING, Final, Optional
from marimo._output.rich_help import mddoc
from marimo._plugins.ui._core.ui_element import UIElement
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class switch(UIElement[bool, bool]):
diff --git a/marimo/_plugins/ui/_impl/table.py b/marimo/_plugins/ui/_impl/table.py
index 7cd780750d..9bb20088fb 100644
--- a/marimo/_plugins/ui/_impl/table.py
+++ b/marimo/_plugins/ui/_impl/table.py
@@ -6,7 +6,6 @@ from dataclasses import dataclass
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Literal,
Optional,
@@ -74,7 +73,7 @@ from marimo._utils.narwhals_utils import (
)
if TYPE_CHECKING:
- from collections.abc import Sequence
+ from collections.abc import Callable, Sequence
from narwhals.typing import IntoLazyFrame
@@ -1329,7 +1328,8 @@ class table(
selected = page_manager.select_cells(all_cells)
cell_to_orig: dict[str, str] = {
- cid: str(rid) for cid, rid in zip(cell_row_ids, row_ids)
+ cid: str(rid)
+ for cid, rid in zip(cell_row_ids, row_ids, strict=False)
}
lookup: dict[str, dict[str, Any]] = {}
for cell in selected:
diff --git a/marimo/_plugins/ui/_impl/tables/default_table.py b/marimo/_plugins/ui/_impl/tables/default_table.py
index 4035e6b52f..cce818ac5d 100644
--- a/marimo/_plugins/ui/_impl/tables/default_table.py
+++ b/marimo/_plugins/ui/_impl/tables/default_table.py
@@ -467,8 +467,8 @@ class DefaultTableManager(TableManager[JsonTableData]):
column_values = data.values()
column_names = list(data.keys())
return [
- dict(zip(column_names, row_values))
- for row_values in zip(*column_values)
+ dict(zip(column_names, row_values, strict=False))
+ for row_values in zip(*column_values, strict=False)
]
# If its a dictionary, convert to key-value pairs
diff --git a/marimo/_plugins/ui/_impl/tables/format.py b/marimo/_plugins/ui/_impl/tables/format.py
index 27f9568a12..98c1927150 100644
--- a/marimo/_plugins/ui/_impl/tables/format.py
+++ b/marimo/_plugins/ui/_impl/tables/format.py
@@ -1,7 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Callable, Union
+from collections.abc import Callable
+from typing import Union
from marimo import _loggers
from marimo._plugins.core.web_component import JSONType
diff --git a/marimo/_plugins/ui/_impl/tabs.py b/marimo/_plugins/ui/_impl/tabs.py
index 6a437a4423..d38450b1ba 100644
--- a/marimo/_plugins/ui/_impl/tabs.py
+++ b/marimo/_plugins/ui/_impl/tabs.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Callable, Final, Optional
+from typing import TYPE_CHECKING, Final, Optional
from marimo._output.formatting import as_html
from marimo._output.md import md
@@ -9,6 +9,9 @@ from marimo._output.rich_help import mddoc
from marimo._plugins.stateless.lazy import lazy as lazy_ui
from marimo._plugins.ui._core.ui_element import UIElement
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
@mddoc
class tabs(UIElement[str, str]):
diff --git a/marimo/_pyodide/bootstrap.py b/marimo/_pyodide/bootstrap.py
index 7251960322..ae86a68b2c 100644
--- a/marimo/_pyodide/bootstrap.py
+++ b/marimo/_pyodide/bootstrap.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import json
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
from marimo._config.config import merge_config
from marimo._messaging.notification import (
@@ -28,6 +28,8 @@ from marimo._session.notebook import AppFileManager
from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from marimo._config.config import MarimoConfig
from marimo._messaging.types import KernelMessage
from marimo._pyodide.pyodide_session import PyodideBridge, PyodideSession
diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.py
index d646fbc60f..732fe9a401 100644
--- a/marimo/_pyodide/pyodide_session.py
+++ b/marimo/_pyodide/pyodide_session.py
@@ -7,7 +7,7 @@ import json
import re
import signal
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, TypeVar, cast
+from typing import TYPE_CHECKING, Any, TypeVar, cast
from marimo import _loggers
from marimo._config.config import (
@@ -76,6 +76,8 @@ from marimo._utils.inline_script_metadata import PyProjectReader
from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from marimo._ast.cell import CellConfig
from marimo._messaging.types import KernelMessage
from marimo._session.notebook.file_manager import AppFileManager
diff --git a/marimo/_pyodide/restartable_task.py b/marimo/_pyodide/restartable_task.py
index 3e23f6ff1c..d2571253d8 100644
--- a/marimo/_pyodide/restartable_task.py
+++ b/marimo/_pyodide/restartable_task.py
@@ -2,7 +2,10 @@
from __future__ import annotations
import asyncio
-from typing import Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
class RestartableTask:
diff --git a/marimo/_pyodide/streams.py b/marimo/_pyodide/streams.py
index 7a53b11f76..80fbc357cf 100644
--- a/marimo/_pyodide/streams.py
+++ b/marimo/_pyodide/streams.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
import sys
-from typing import TYPE_CHECKING, Callable, Optional
+from typing import TYPE_CHECKING, Optional
from marimo import _loggers
from marimo._messaging.cell_output import CellOutput
@@ -21,7 +21,7 @@ from marimo._messaging.types import (
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
- from collections.abc import Iterable
+ from collections.abc import Callable, Iterable
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_runtime/app/script_runner.py b/marimo/_runtime/app/script_runner.py
index 0b14d944b9..cf1296d3e3 100644
--- a/marimo/_runtime/app/script_runner.py
+++ b/marimo/_runtime/app/script_runner.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
from collections import deque
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo._ast.names import SETUP_CELL_NAME
from marimo._dependencies.dependencies import DependencyManager
@@ -32,6 +32,8 @@ from marimo._runtime.patches import (
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from marimo._ast.app import InternalApp
diff --git a/marimo/_runtime/commands.py b/marimo/_runtime/commands.py
index e2c9efdcf5..3b8222c065 100644
--- a/marimo/_runtime/commands.py
+++ b/marimo/_runtime/commands.py
@@ -267,7 +267,7 @@ class ExecuteCellsCommand(Command):
request=self.request,
timestamp=self.timestamp,
)
- for cell_id, code in zip(self.cell_ids, self.codes)
+ for cell_id, code in zip(self.cell_ids, self.codes, strict=False)
]
def __post_init__(self) -> None:
@@ -401,7 +401,7 @@ class UpdateUIElementCommand(Command):
return UpdateUIElementCommand(
object_ids=[], values=[], request=request
)
- object_ids, values = zip(*ids_and_values)
+ object_ids, values = zip(*ids_and_values, strict=False)
return UpdateUIElementCommand(
object_ids=list(object_ids),
values=list(values),
@@ -415,7 +415,7 @@ class UpdateUIElementCommand(Command):
Returns:
List of (id, value) tuples.
"""
- return list(zip(self.object_ids, self.values))
+ return list(zip(self.object_ids, self.values, strict=False))
class InvokeFunctionCommand(Command):
diff --git a/marimo/_runtime/copy.py b/marimo/_runtime/copy.py
index 3c15a669e8..1504fdf166 100644
--- a/marimo/_runtime/copy.py
+++ b/marimo/_runtime/copy.py
@@ -3,10 +3,10 @@ from __future__ import annotations
import inspect
import weakref
+from collections.abc import Callable
from copy import copy
from typing import (
Any,
- Callable,
Generic,
TypeVar,
Union,
diff --git a/marimo/_runtime/dataflow/__init__.py b/marimo/_runtime/dataflow/__init__.py
index 0897cd4048..bfb378803c 100644
--- a/marimo/_runtime/dataflow/__init__.py
+++ b/marimo/_runtime/dataflow/__init__.py
@@ -2,7 +2,7 @@
from __future__ import annotations
from collections import deque
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo import _loggers
from marimo._ast.cell import CellImpl
@@ -13,7 +13,7 @@ from marimo._runtime.dataflow.types import Edge, EdgeWithVar
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
- from collections.abc import Collection
+ from collections.abc import Callable, Collection
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_runtime/dataflow/graph.py b/marimo/_runtime/dataflow/graph.py
index 71c14e6274..25d6e92449 100644
--- a/marimo/_runtime/dataflow/graph.py
+++ b/marimo/_runtime/dataflow/graph.py
@@ -5,7 +5,7 @@ from __future__ import annotations
import threading
from dataclasses import dataclass, field
-from typing import TYPE_CHECKING, Callable, Literal, Optional
+from typing import TYPE_CHECKING, Literal, Optional
from marimo import _loggers
from marimo._ast.compiler import code_key
@@ -19,7 +19,7 @@ from marimo._runtime.dataflow.topology import (
)
if TYPE_CHECKING:
- from collections.abc import Mapping
+ from collections.abc import Callable, Mapping
from marimo._ast.cell import CellImpl
from marimo._ast.visitor import ImportData, Name, VariableData
diff --git a/marimo/_runtime/functions.py b/marimo/_runtime/functions.py
index 14615fd320..a7b4150900 100644
--- a/marimo/_runtime/functions.py
+++ b/marimo/_runtime/functions.py
@@ -4,14 +4,14 @@
from __future__ import annotations
import dataclasses
-from typing import TYPE_CHECKING, Any, Callable, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
from marimo._loggers import marimo_logger
from marimo._types.ids import CellId_t
from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
- from collections.abc import Coroutine
+ from collections.abc import Callable, Coroutine
LOGGER = marimo_logger()
diff --git a/marimo/_runtime/handlers.py b/marimo/_runtime/handlers.py
index b024e5a9cd..5ccd2bc7a5 100644
--- a/marimo/_runtime/handlers.py
+++ b/marimo/_runtime/handlers.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import os
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo import _loggers
from marimo._messaging.notification import InterruptedNotification
@@ -15,6 +15,8 @@ from marimo._runtime.control_flow import MarimoInterrupt
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from marimo._runtime.runtime import Kernel
diff --git a/marimo/_runtime/packages/package_manager.py b/marimo/_runtime/packages/package_manager.py
index e267b170cf..8836e3efc8 100644
--- a/marimo/_runtime/packages/package_manager.py
+++ b/marimo/_runtime/packages/package_manager.py
@@ -4,7 +4,8 @@ from __future__ import annotations
import abc
import subprocess
import sys
-from typing import TYPE_CHECKING, Callable, Optional
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Optional
import msgspec
diff --git a/marimo/_runtime/patches.py b/marimo/_runtime/patches.py
index 6bbafd030a..7d9084ba7c 100644
--- a/marimo/_runtime/patches.py
+++ b/marimo/_runtime/patches.py
@@ -7,7 +7,8 @@ import functools
import sys
import textwrap
import types
-from typing import TYPE_CHECKING, Any, Callable
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any
from marimo._ast.parse import ast_parse
from marimo._dependencies.dependencies import DependencyManager
@@ -507,7 +508,7 @@ def patch_polars_write_json() -> Unpatch:
headers: list[str] = lines[0].split(",")
for line in lines[1:]:
values: list[str] = line.split(",")
- json_data.append(dict(zip(headers, values)))
+ json_data.append(dict(zip(headers, values, strict=False)))
if file is None:
return json.dumps(json_data)
diff --git a/marimo/_runtime/primitives.py b/marimo/_runtime/primitives.py
index 4dffec90bd..18f030ccc5 100644
--- a/marimo/_runtime/primitives.py
+++ b/marimo/_runtime/primitives.py
@@ -4,7 +4,8 @@ from __future__ import annotations
import inspect
import numbers
import weakref
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Optional, Union
from marimo._ast.cell import Cell
from marimo._ast.visitor import Name, VariableData
diff --git a/marimo/_runtime/pytest.py b/marimo/_runtime/pytest.py
index 7e449f33d1..70688dea41 100644
--- a/marimo/_runtime/pytest.py
+++ b/marimo/_runtime/pytest.py
@@ -5,7 +5,7 @@ import os
import re
import sys
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo._ast.cell import Cell
from marimo._ast.pytest import MARIMO_TEST_STUB_NAME
@@ -19,6 +19,7 @@ MARIMO_TEST_BLOCK_REGEX = re.compile(rf"{MARIMO_TEST_STUB_NAME}_\d+[(?::)\.]+")
if TYPE_CHECKING:
+ from collections.abc import Callable
from pathlib import Path
import _pytest.Item # type: ignore
diff --git a/marimo/_runtime/reload/autoreload.py b/marimo/_runtime/reload/autoreload.py
index 61df8f26a9..20a961faef 100644
--- a/marimo/_runtime/reload/autoreload.py
+++ b/marimo/_runtime/reload/autoreload.py
@@ -22,12 +22,15 @@ import weakref
from dataclasses import dataclass
from importlib import reload
from importlib.util import source_from_cache
-from typing import Any, Callable, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, TypeVar
from marimo import _loggers
from marimo._ast.cell import CellImpl
from marimo._messaging.tracebacks import write_traceback
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
func_attrs = [
diff --git a/marimo/_runtime/reload/module_watcher.py b/marimo/_runtime/reload/module_watcher.py
index b684542a62..5c848f87a2 100644
--- a/marimo/_runtime/reload/module_watcher.py
+++ b/marimo/_runtime/reload/module_watcher.py
@@ -6,7 +6,7 @@ import pathlib
import sys
import threading
import time
-from typing import TYPE_CHECKING, Callable, Literal
+from typing import TYPE_CHECKING, Literal
from marimo import _loggers
from marimo._messaging.types import Stream
@@ -19,6 +19,7 @@ from marimo._runtime.reload.autoreload import (
if TYPE_CHECKING:
import types
+ from collections.abc import Callable
from marimo._types.ids import CellId_t
diff --git a/marimo/_runtime/runner/hook_context.py b/marimo/_runtime/runner/hook_context.py
index 1e07f03d85..9d51c5da88 100644
--- a/marimo/_runtime/runner/hook_context.py
+++ b/marimo/_runtime/runner/hook_context.py
@@ -1,8 +1,9 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from collections.abc import Callable
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, TypeAlias, Union
+from typing import TYPE_CHECKING, Any, TypeAlias, Union
from marimo._config.config import MarimoConfig, OnCellChangeType
from marimo._messaging.errors import Error
diff --git a/marimo/_runtime/runner/hooks.py b/marimo/_runtime/runner/hooks.py
index 5ac4e9abef..ff95b52708 100644
--- a/marimo/_runtime/runner/hooks.py
+++ b/marimo/_runtime/runner/hooks.py
@@ -1,9 +1,10 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from collections.abc import Callable
from dataclasses import dataclass, field
from enum import IntEnum
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
if TYPE_CHECKING:
from collections.abc import Sequence
diff --git a/marimo/_runtime/runtime.py b/marimo/_runtime/runtime.py
index 158b56018b..8ad5bee9be 100644
--- a/marimo/_runtime/runtime.py
+++ b/marimo/_runtime/runtime.py
@@ -20,7 +20,6 @@ from pathlib import Path
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Optional,
cast,
)
@@ -228,7 +227,7 @@ from marimo._utils.signals import restore_signals
from marimo._utils.typed_connection import TypedConnection
if TYPE_CHECKING:
- from collections.abc import Awaitable, Iterator, Sequence
+ from collections.abc import Awaitable, Callable, Iterator, Sequence
from types import ModuleType
from marimo._plugins.ui._core.ui_element import UIElement
diff --git a/marimo/_runtime/state.py b/marimo/_runtime/state.py
index 861afd68db..1d03e43953 100644
--- a/marimo/_runtime/state.py
+++ b/marimo/_runtime/state.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import types
import weakref
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Generic, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Generic, Optional, TypeVar
from uuid import uuid4
from marimo._output.rich_help import mddoc
@@ -14,7 +14,7 @@ T = TypeVar("T")
Id = int
if TYPE_CHECKING:
- from collections.abc import Mapping
+ from collections.abc import Callable, Mapping
@dataclass
diff --git a/marimo/_runtime/utils/set_ui_element_request_manager.py b/marimo/_runtime/utils/set_ui_element_request_manager.py
index 0cc334a0df..86251b092a 100644
--- a/marimo/_runtime/utils/set_ui_element_request_manager.py
+++ b/marimo/_runtime/utils/set_ui_element_request_manager.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Callable, Generic, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Generic, TypeVar, Union
from marimo._runtime.commands import (
BatchableCommand,
@@ -15,6 +15,7 @@ from marimo._types.ids import UIElementId, WidgetModelId
if TYPE_CHECKING:
import asyncio
+ from collections.abc import Callable
A = TypeVar("A")
B = TypeVar("B")
@@ -130,7 +131,9 @@ def _merge_model_commands(
}
# Merge state and buffers
model_state[mid].update(cmd.message.state)
- for path, buf in zip(cmd.message.buffer_paths, cmd.buffers):
+ for path, buf in zip(
+ cmd.message.buffer_paths, cmd.buffers, strict=False
+ ):
model_buffers[mid][tuple(path)] = buf
for mid in model_state:
diff --git a/marimo/_runtime/watch/_directory.py b/marimo/_runtime/watch/_directory.py
index da64e069c4..788be76ecb 100644
--- a/marimo/_runtime/watch/_directory.py
+++ b/marimo/_runtime/watch/_directory.py
@@ -6,7 +6,7 @@ import os
import sys
import time
from pathlib import Path
-from typing import TYPE_CHECKING, Callable, cast
+from typing import TYPE_CHECKING, cast
from marimo._output.rich_help import mddoc
from marimo._runtime.watch._path import (
@@ -17,7 +17,7 @@ from marimo._runtime.watch._path import (
if TYPE_CHECKING:
import threading
- from collections.abc import Iterable
+ from collections.abc import Callable, Iterable
# For testing only - do not use in production
diff --git a/marimo/_runtime/watch/_file.py b/marimo/_runtime/watch/_file.py
index 3bccbac7d9..30beaaef59 100644
--- a/marimo/_runtime/watch/_file.py
+++ b/marimo/_runtime/watch/_file.py
@@ -6,7 +6,7 @@ import sys
import threading
import time
from pathlib import Path
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo._output.rich_help import mddoc
from marimo._runtime.watch._path import (
@@ -15,6 +15,9 @@ from marimo._runtime.watch._path import (
write_side_effect,
)
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
# For testing only - do not use in production
_TEST_SLEEP_INTERVAL: float | None = None
diff --git a/marimo/_runtime/watch/_path.py b/marimo/_runtime/watch/_path.py
index 24f66b543f..128307cce4 100644
--- a/marimo/_runtime/watch/_path.py
+++ b/marimo/_runtime/watch/_path.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import sys
import threading
from pathlib import Path
-from typing import Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
from marimo import _loggers
from marimo._runtime.context import (
@@ -17,6 +17,9 @@ from marimo._runtime.state import State
from marimo._runtime.threads import Thread
from marimo._utils.platform import is_pyodide
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
if sys.version_info >= (3, 11):
diff --git a/marimo/_save/hash.py b/marimo/_save/hash.py
index ca87b47906..b1f7df7e96 100644
--- a/marimo/_save/hash.py
+++ b/marimo/_save/hash.py
@@ -8,7 +8,7 @@ import hashlib
import inspect
import sys
import types
-from typing import TYPE_CHECKING, Any, Callable, NamedTuple, Optional
+from typing import TYPE_CHECKING, Any, NamedTuple, Optional
from marimo._ast.transformers import DeprivateVisitor, get_hashable_ast
from marimo._ast.variables import (
@@ -46,6 +46,7 @@ from marimo._save.stubs import maybe_get_custom_stub
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
+ from collections.abc import Callable
from types import CodeType
from marimo._ast.cell import CellImpl
@@ -518,7 +519,7 @@ class BlockHasher:
ref_list = ", ".join(
[
f"{ref}: {get_type(ref)} ({str(e)})"
- for ref, e in zip(failed, exceptions)
+ for ref, e in zip(failed, exceptions, strict=False)
]
)
# Note ExceptionGroup nicest here, but only available in 3.11
diff --git a/marimo/_save/loaders/memory.py b/marimo/_save/loaders/memory.py
index d774c9cf79..bd41e4f296 100644
--- a/marimo/_save/loaders/memory.py
+++ b/marimo/_save/loaders/memory.py
@@ -3,12 +3,13 @@ from __future__ import annotations
import threading
from collections import OrderedDict
-from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar, Union
+from typing import TYPE_CHECKING, Any, Optional, TypeVar, Union
from marimo._save.cache import Cache
from marimo._save.loaders.loader import Loader
if TYPE_CHECKING:
+ from collections.abc import Callable
from pathlib import Path
from marimo._save.hash import HashKey
diff --git a/marimo/_save/save.py b/marimo/_save/save.py
index feee77f5c4..0b390be1e0 100644
--- a/marimo/_save/save.py
+++ b/marimo/_save/save.py
@@ -12,6 +12,7 @@ import time
import traceback
import weakref
from collections import abc
+from collections.abc import Callable
# NB: maxsize follows functools.cache, but renamed max_size outside of drop-in
# api.
@@ -19,7 +20,6 @@ from sys import maxsize as MAXINT
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Concatenate,
Generic,
Optional,
@@ -291,7 +291,10 @@ class _cache_call(CacheContext, Generic[P, R]):
)
# Rewrite scoped args to prevent shadowed variables
- arg_dict = {f"{ARG_PREFIX}{k}": v for (k, v) in zip(self._args, args)}
+ arg_dict = {
+ f"{ARG_PREFIX}{k}": v
+ for (k, v) in zip(self._args, args, strict=False)
+ }
kwargs_copy = {f"{ARG_PREFIX}{k}": v for (k, v) in kwargs.items()}
# Fill in default values for arguments not explicitly provided
# This ensures cache hashes are based on resolved argument values
diff --git a/marimo/_save/stubs/__init__.py b/marimo/_save/stubs/__init__.py
index 7ad242c467..5384173cc5 100644
--- a/marimo/_save/stubs/__init__.py
+++ b/marimo/_save/stubs/__init__.py
@@ -3,7 +3,7 @@
from __future__ import annotations
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo._save.stubs.function_stub import FunctionStub
from marimo._save.stubs.lazy_stub import ReferenceStub
@@ -16,6 +16,9 @@ from marimo._save.stubs.stubs import (
)
from marimo._save.stubs.ui_element_stub import UIElementStub
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
# Track which class names we've already attempted to register
_REGISTERED_NAMES: set[str] = set()
diff --git a/marimo/_save/toplevel.py b/marimo/_save/toplevel.py
index 9be98d1731..3d223b9907 100644
--- a/marimo/_save/toplevel.py
+++ b/marimo/_save/toplevel.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
from marimo import _loggers
from marimo._ast.app import App, InternalApp
@@ -13,6 +13,9 @@ from marimo._ast.toplevel import TopLevelExtraction
from marimo._runtime.dataflow import DirectedGraph
from marimo._types.ids import CellId_t
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_schemas/serialization.py b/marimo/_schemas/serialization.py
index ea0b726073..27f43c1e98 100644
--- a/marimo/_schemas/serialization.py
+++ b/marimo/_schemas/serialization.py
@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, Any, Optional, Union
from marimo._ast.names import DEFAULT_CELL_NAME
if TYPE_CHECKING:
- from typing_extensions import TypeAlias
+ from typing import TypeAlias
NodeRef: TypeAlias = Union[ast.stmt, ast.expr]
diff --git a/marimo/_server/ai/mcp/client.py b/marimo/_server/ai/mcp/client.py
index cea26cb9e9..1b0830ab8b 100644
--- a/marimo/_server/ai/mcp/client.py
+++ b/marimo/_server/ai/mcp/client.py
@@ -164,7 +164,7 @@ class MCPClient:
)
for server_name, result in zip(
- servers_to_connect.keys(), connection_results
+ servers_to_connect.keys(), connection_results, strict=False
):
if isinstance(result, Exception):
LOGGER.error(
@@ -428,7 +428,7 @@ class MCPClient:
)
for server_name, result in zip(
- self.servers.keys(), connection_results
+ self.servers.keys(), connection_results, strict=False
):
if isinstance(result, Exception):
LOGGER.error(f"Failed to connect to {server_name}: {result}")
diff --git a/marimo/_server/ai/tools/tool_manager.py b/marimo/_server/ai/tools/tool_manager.py
index 3b7073931c..f5911c2d25 100644
--- a/marimo/_server/ai/tools/tool_manager.py
+++ b/marimo/_server/ai/tools/tool_manager.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from starlette.applications import (
Starlette, # noqa: TCH002 - required at runtime
@@ -22,6 +22,8 @@ from marimo._server.ai.tools.types import (
from marimo._utils.once import once
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from mcp.types import ( # type: ignore[import-not-found]
CallToolResult,
Tool as MCPRawTool,
diff --git a/marimo/_server/ai/tools/types.py b/marimo/_server/ai/tools/types.py
index 3b2ef1ad5d..44b45438df 100644
--- a/marimo/_server/ai/tools/types.py
+++ b/marimo/_server/ai/tools/types.py
@@ -1,8 +1,9 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from collections.abc import Callable
from dataclasses import dataclass
-from typing import Any, Callable, Literal, Optional, TypeVar
+from typing import Any, Literal, Optional, TypeVar
from marimo._config.config import CopilotMode
diff --git a/marimo/_server/api/endpoints/terminal.py b/marimo/_server/api/endpoints/terminal.py
index 538ae991de..b0580b3400 100644
--- a/marimo/_server/api/endpoints/terminal.py
+++ b/marimo/_server/api/endpoints/terminal.py
@@ -9,7 +9,7 @@ import signal
import struct
import sys
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Literal, TypedDict
+from typing import TYPE_CHECKING, Any, Literal, TypedDict
from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
@@ -22,7 +22,7 @@ from marimo._session.model import SessionMode
from marimo._utils.platform import is_pyodide, is_windows
if TYPE_CHECKING:
- from collections.abc import Iterable
+ from collections.abc import Callable, Iterable
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
index 7cda4f9bf0..c5a3ebe30c 100644
--- a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
+++ b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
@@ -120,7 +120,8 @@ def _extract_cell_data(
cell.id,
)
for cell in document.cells
- )
+ ),
+ strict=False,
)
)
return codes, names, configs, cell_ids
@@ -131,7 +132,8 @@ def _extract_cell_data(
*tuple(
("", cell.name, cell.config, cell.id)
for cell in document.cells
- )
+ ),
+ strict=False,
)
)
return codes, names, configs, cell_ids
diff --git a/marimo/_server/api/endpoints/ws/ws_message_loop.py b/marimo/_server/api/endpoints/ws/ws_message_loop.py
index b5d228e90b..bc7e9c294b 100644
--- a/marimo/_server/api/endpoints/ws/ws_message_loop.py
+++ b/marimo/_server/api/endpoints/ws/ws_message_loop.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import asyncio
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
from starlette.websockets import WebSocketDisconnect, WebSocketState
@@ -16,6 +16,8 @@ from marimo._messaging.types import KernelMessage
from marimo._server.api.endpoints.ws.ws_formatter import format_wire_message
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from starlette.websockets import WebSocket
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/api/endpoints/ws_endpoint.py b/marimo/_server/api/endpoints/ws_endpoint.py
index bf7a71b555..31b8b36577 100644
--- a/marimo/_server/api/endpoints/ws_endpoint.py
+++ b/marimo/_server/api/endpoints/ws_endpoint.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import asyncio
import sys
-from typing import Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from starlette.websockets import WebSocket, WebSocketState
@@ -55,6 +55,9 @@ from marimo._session.model import (
)
from marimo._types.ids import CellId_t, ConsumerId
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
LORO_ALLOWED = sys.version_info >= (3, 11)
diff --git a/marimo/_server/api/interrupt.py b/marimo/_server/api/interrupt.py
index 3e7070d1df..b32cabd890 100644
--- a/marimo/_server/api/interrupt.py
+++ b/marimo/_server/api/interrupt.py
@@ -5,7 +5,7 @@ import asyncio
import signal
import sys
import time
-from typing import Callable
+from typing import TYPE_CHECKING
from marimo._config.settings import GLOBAL_SETTINGS
from marimo._utils.print import (
@@ -13,6 +13,9 @@ from marimo._utils.print import (
print_,
)
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
class InterruptHandler:
def __init__(self, quiet: bool, shutdown: Callable[[], None]) -> None:
diff --git a/marimo/_server/api/middleware.py b/marimo/_server/api/middleware.py
index e9d10f8a85..786d00f88d 100644
--- a/marimo/_server/api/middleware.py
+++ b/marimo/_server/api/middleware.py
@@ -3,13 +3,12 @@ from __future__ import annotations
import asyncio
import time
-from collections.abc import AsyncIterable
+from collections.abc import AsyncIterable, Callable
from dataclasses import dataclass
from http.client import HTTPResponse, HTTPSConnection
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Final,
Optional,
Union,
diff --git a/marimo/_server/asgi.py b/marimo/_server/asgi.py
index 6b945a7b6b..a8a34ae78e 100644
--- a/marimo/_server/asgi.py
+++ b/marimo/_server/asgi.py
@@ -4,12 +4,11 @@ from __future__ import annotations
import abc
import logging
from asyncio import iscoroutine
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
from functools import partial
from pathlib import Path
from typing import (
TYPE_CHECKING,
- Callable,
Optional,
Protocol,
Union,
diff --git a/marimo/_server/router.py b/marimo/_server/router.py
index 60599ee67e..c58dffc8b7 100644
--- a/marimo/_server/router.py
+++ b/marimo/_server/router.py
@@ -2,8 +2,9 @@
from __future__ import annotations
from asyncio import iscoroutine
+from collections.abc import Callable
from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Callable, Optional, TypeVar
+from typing import TYPE_CHECKING, Any, Optional, TypeVar
from starlette.responses import (
FileResponse,
diff --git a/marimo/_server/rtc/doc.py b/marimo/_server/rtc/doc.py
index 7b42ba2933..fb6711fde5 100644
--- a/marimo/_server/rtc/doc.py
+++ b/marimo/_server/rtc/doc.py
@@ -72,7 +72,7 @@ class LoroDocManager:
# Add all cell code to the doc
doc_codes = doc.get_map("codes")
doc.get_map("languages")
- for cell_id, code in zip(cell_ids, codes):
+ for cell_id, code in zip(cell_ids, codes, strict=False):
cell_text = LoroText() # type: ignore[no-untyped-call]
cell_text.insert(0, code)
doc_codes.insert_container(cell_id, cell_text)
diff --git a/marimo/_session/file_change_handler.py b/marimo/_session/file_change_handler.py
index 6de2ba2f53..7b9819efdc 100644
--- a/marimo/_session/file_change_handler.py
+++ b/marimo/_session/file_change_handler.py
@@ -150,7 +150,7 @@ class EditModeReloadStrategy(ReloadStrategy):
changed_not_deleted = list(changed_cell_ids - deleted)
session.put_control_request(
SyncGraphCommand(
- cells=dict(zip(cell_ids, codes)),
+ cells=dict(zip(cell_ids, codes, strict=False)),
run_ids=changed_not_deleted,
delete_ids=sorted(deleted),
),
@@ -161,7 +161,7 @@ class EditModeReloadStrategy(ReloadStrategy):
# cells are cleaned up from the dependency graph.
session.put_control_request(
SyncGraphCommand(
- cells=dict(zip(cell_ids, codes)),
+ cells=dict(zip(cell_ids, codes, strict=False)),
run_ids=[],
delete_ids=sorted(deleted),
),
diff --git a/marimo/_session/file_watcher_integration.py b/marimo/_session/file_watcher_integration.py
index 6e075eec5e..4f19933ff7 100644
--- a/marimo/_session/file_watcher_integration.py
+++ b/marimo/_session/file_watcher_integration.py
@@ -8,7 +8,7 @@ without leaking implementation details or monkey-patching.
from __future__ import annotations
from pathlib import Path
-from typing import TYPE_CHECKING, Callable
+from typing import TYPE_CHECKING
from marimo import _loggers
from marimo._session.extensions.types import EventAwareExtension
@@ -19,7 +19,7 @@ from marimo._utils.paths import normalize_path
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from collections.abc import Awaitable
+ from collections.abc import Awaitable, Callable
from marimo._session.events import SessionEventBus
diff --git a/marimo/_session/state/serialize.py b/marimo/_session/state/serialize.py
index 9f664df45f..777f73d509 100644
--- a/marimo/_session/state/serialize.py
+++ b/marimo/_session/state/serialize.py
@@ -493,7 +493,9 @@ class SessionCacheManager:
return False
if (len(key.codes) != len(notebook_session["cells"])) or any(
_hash_code(code) != cell["code_hash"]
- for code, cell in zip(key.codes, notebook_session["cells"])
+ for code, cell in zip(
+ key.codes, notebook_session["cells"], strict=False
+ )
):
return False
if key.marimo_version != metadata.get("marimo_version"):
@@ -529,7 +531,7 @@ class SessionCacheManager:
# Build mapping from code_hash to cell_id based on current cell IDs
# This handles cases where cell_ids have changed even though code matches
code_hash_to_cell_id: dict[str, CellId_t] = {}
- for code, cell_id in zip(key.codes, key.cell_ids):
+ for code, cell_id in zip(key.codes, key.cell_ids, strict=False):
code_hash = _hash_code(code)
if code_hash is not None:
# Map the code_hash to the current cell_id from the key
diff --git a/marimo/_session/state/session_view.py b/marimo/_session/state/session_view.py
index fe06b40f29..d907ce9da9 100644
--- a/marimo/_session/state/session_view.py
+++ b/marimo/_session/state/session_view.py
@@ -73,7 +73,10 @@ class ModelReplayState:
@staticmethod
def from_open(model_id: WidgetModelId, msg: ModelOpen) -> ModelReplayState:
- buffers = {tuple(p): b for p, b in zip(msg.buffer_paths, msg.buffers)}
+ buffers = {
+ tuple(p): b
+ for p, b in zip(msg.buffer_paths, msg.buffers, strict=False)
+ }
return ModelReplayState(
model_id=model_id,
state=dict(msg.state),
@@ -91,7 +94,7 @@ class ModelReplayState:
}
# Merge new state and buffers
self.state.update(msg.state)
- for path, buf in zip(msg.buffer_paths, msg.buffers):
+ for path, buf in zip(msg.buffer_paths, msg.buffers, strict=False):
self.buffers[tuple(path)] = buf
def to_notification(self) -> ModelLifecycleNotification:
diff --git a/marimo/_sql/engines/sqlalchemy.py b/marimo/_sql/engines/sqlalchemy.py
index ac2b6c9e1c..4819d1d3f0 100644
--- a/marimo/_sql/engines/sqlalchemy.py
+++ b/marimo/_sql/engines/sqlalchemy.py
@@ -7,7 +7,6 @@ from contextlib import contextmanager
from typing import (
TYPE_CHECKING,
Any,
- Callable,
Literal,
Optional,
ParamSpec,
@@ -36,7 +35,7 @@ from marimo._types.ids import VariableName
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from collections.abc import Iterator
+ from collections.abc import Callable, Iterator
import pandas as pd
import polars as pl
diff --git a/marimo/_sql/error_utils.py b/marimo/_sql/error_utils.py
index c6ba9bbe51..a95882230e 100644
--- a/marimo/_sql/error_utils.py
+++ b/marimo/_sql/error_utils.py
@@ -2,12 +2,13 @@
from __future__ import annotations
import re
-from typing import TYPE_CHECKING, Callable, Optional, TypedDict
+from typing import TYPE_CHECKING, Optional, TypedDict
from marimo._dependencies.dependencies import DependencyManager
if TYPE_CHECKING:
import ast
+ from collections.abc import Callable
from marimo._messaging.errors import MarimoSQLError
diff --git a/marimo/_sql/parse.py b/marimo/_sql/parse.py
index 87c1ea218f..1ca577b926 100644
--- a/marimo/_sql/parse.py
+++ b/marimo/_sql/parse.py
@@ -2,13 +2,16 @@
from __future__ import annotations
import re
-from typing import Any, Callable, Literal, Optional, Union
+from typing import TYPE_CHECKING, Any, Literal, Optional, Union
import msgspec
from marimo import _loggers
from marimo._dependencies.dependencies import DependencyManager
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_sql/utils.py b/marimo/_sql/utils.py
index 8860d9a261..4105fb505e 100644
--- a/marimo/_sql/utils.py
+++ b/marimo/_sql/utils.py
@@ -2,7 +2,7 @@
from __future__ import annotations
from contextlib import nullcontext
-from typing import TYPE_CHECKING, Any, Callable, Optional, Union, cast
+from typing import TYPE_CHECKING, Any, Optional, Union, cast
from marimo import _loggers
from marimo._config.config import SqlOutputType
@@ -14,6 +14,8 @@ from marimo._runtime.context.types import (
)
if TYPE_CHECKING:
+ from collections.abc import Callable
+
import duckdb
import pandas as pd
import polars as pl
diff --git a/marimo/_utils/cell_matching.py b/marimo/_utils/cell_matching.py
index 8487618848..e3d00e034b 100644
--- a/marimo/_utils/cell_matching.py
+++ b/marimo/_utils/cell_matching.py
@@ -14,7 +14,7 @@ def similarity_score(s1: str, s2: str) -> float:
Returns lower score for more similar strings."""
# Find common prefix length
prefix_len = 0
- for c1, c2 in zip(s1, s2):
+ for c1, c2 in zip(s1, s2, strict=False):
if c1 != c2:
break
prefix_len += 1
@@ -24,7 +24,7 @@ def similarity_score(s1: str, s2: str) -> float:
s1_rev = s1[::-1]
s2_rev = s2[::-1]
suffix_len = 0
- for c1, c2 in zip(s1_rev, s2_rev):
+ for c1, c2 in zip(s1_rev, s2_rev, strict=False):
if c1 != c2:
break
suffix_len += 1
@@ -39,7 +39,7 @@ def group_lookup(
ids: Sequence[CellId_t], codes: Sequence[str]
) -> dict[str, list[tuple[int, CellId_t]]]:
lookup: dict[str, list[tuple[int, CellId_t]]] = {}
- for idx, (cell_id, code) in enumerate(zip(ids, codes)):
+ for idx, (cell_id, code) in enumerate(zip(ids, codes, strict=False)):
lookup.setdefault(code, []).append((idx, cell_id))
return lookup
@@ -289,8 +289,8 @@ def match_cell_ids_by_similarity(
A map of old ids to new ids, using prev_ids where possible
"""
- prev_ids, prev_codes = zip(*prev_data.items())
- next_ids, next_codes = zip(*next_data.items())
+ prev_ids, prev_codes = zip(*prev_data.items(), strict=False)
+ next_ids, next_codes = zip(*next_data.items(), strict=False)
sorted_ids = _match_cell_ids_by_similarity(
prev_ids,
@@ -299,4 +299,4 @@ def match_cell_ids_by_similarity(
next_codes,
)
- return dict(zip(sorted_ids, next_ids))
+ return dict(zip(sorted_ids, next_ids, strict=False))
diff --git a/marimo/_utils/debounce.py b/marimo/_utils/debounce.py
index 9dda051881..7c9fb33ecb 100644
--- a/marimo/_utils/debounce.py
+++ b/marimo/_utils/debounce.py
@@ -2,8 +2,9 @@
from __future__ import annotations
import time
+from collections.abc import Callable
from functools import wraps
-from typing import Any, Callable, TypeVar, cast
+from typing import Any, TypeVar, cast
F = TypeVar("F", bound=Callable[..., None])
diff --git a/marimo/_utils/deprecated.py b/marimo/_utils/deprecated.py
index 0e7aa037a2..f9c9157048 100644
--- a/marimo/_utils/deprecated.py
+++ b/marimo/_utils/deprecated.py
@@ -3,7 +3,10 @@ from __future__ import annotations
import functools
import warnings
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
def deprecated(reason: str) -> Callable[[Any], Any]:
diff --git a/marimo/_utils/disposable.py b/marimo/_utils/disposable.py
index 35ab5d37d9..1bcd1e0a05 100644
--- a/marimo/_utils/disposable.py
+++ b/marimo/_utils/disposable.py
@@ -1,7 +1,10 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Callable
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
class Disposable:
diff --git a/marimo/_utils/distributor.py b/marimo/_utils/distributor.py
index dd8a745fd5..c790f2bce2 100644
--- a/marimo/_utils/distributor.py
+++ b/marimo/_utils/distributor.py
@@ -4,7 +4,8 @@ from __future__ import annotations
import asyncio
import threading
import time
-from typing import Any, Callable, Generic, Protocol, TypeVar, Union
+from collections.abc import Callable
+from typing import Any, Generic, Protocol, TypeVar, Union
from marimo import _loggers
from marimo._session.queue import QueueType
diff --git a/marimo/_utils/file_watcher.py b/marimo/_utils/file_watcher.py
index 4354acdc05..72dda3eb6b 100644
--- a/marimo/_utils/file_watcher.py
+++ b/marimo/_utils/file_watcher.py
@@ -5,9 +5,9 @@ import asyncio
import os
from abc import ABC, abstractmethod
from collections import defaultdict
-from collections.abc import Awaitable, Coroutine
+from collections.abc import Awaitable, Callable, Coroutine
from pathlib import Path
-from typing import Callable, Optional
+from typing import Optional
from marimo import _loggers
from marimo._dependencies.dependencies import DependencyManager
diff --git a/marimo/_utils/flatten.py b/marimo/_utils/flatten.py
index 3d0bedb035..ff69a8bbbb 100644
--- a/marimo/_utils/flatten.py
+++ b/marimo/_utils/flatten.py
@@ -12,7 +12,8 @@ installation of dm-tree on macOS is buggy
from __future__ import annotations
import itertools
-from typing import Any, Callable, Union
+from collections.abc import Callable
+from typing import Any, Union
STRUCT_TYPE = Union[tuple[Any, ...], list[Any], dict[Any, Any]]
UNFLATTEN_TYPE = Callable[[list[Any]], Union[STRUCT_TYPE, Any]]
@@ -110,7 +111,7 @@ def _flatten_sequence(
#
# we chain the unflattened pieces together to pack them according to
# the structure of value
- for unflattener, length in zip(unflatteners, lengths):
+ for unflattener, length in zip(unflatteners, lengths, strict=False):
unflattened_pieces.append(
unflattener(vector[pointer : pointer + length])
)
@@ -189,7 +190,9 @@ def _flatten(
def unflatten(vector: list[Any]) -> STRUCT_TYPE:
pointer = 0
d = {}
- for key, unflattener, length in zip(keys, unflatteners, lengths):
+ for key, unflattener, length in zip(
+ keys, unflatteners, lengths, strict=False
+ ):
piece = vector[pointer : pointer + length]
d[key] = unflattener(piece)
pointer += length
diff --git a/marimo/_utils/memoize.py b/marimo/_utils/memoize.py
index 812374eb85..8291a2908b 100644
--- a/marimo/_utils/memoize.py
+++ b/marimo/_utils/memoize.py
@@ -1,7 +1,10 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from typing import Any, Callable, TypeVar, cast
+from typing import TYPE_CHECKING, Any, TypeVar, cast
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
T = TypeVar("T")
diff --git a/marimo/_utils/methods.py b/marimo/_utils/methods.py
index 2614cd86bf..f3c570fc66 100644
--- a/marimo/_utils/methods.py
+++ b/marimo/_utils/methods.py
@@ -3,7 +3,8 @@ from __future__ import annotations
import inspect
import types
-from typing import Any, Callable, cast
+from collections.abc import Callable
+from typing import Any, cast
def is_callable_method(obj: Any, attr: str) -> bool:
diff --git a/marimo/_utils/narwhals_utils.py b/marimo/_utils/narwhals_utils.py
index 1085b8f7d2..ebb19864f7 100644
--- a/marimo/_utils/narwhals_utils.py
+++ b/marimo/_utils/narwhals_utils.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import csv
import io
import sys
-from typing import TYPE_CHECKING, Any, Callable, Union, overload
+from typing import TYPE_CHECKING, Any, Union, overload
import narwhals as nw_main
import narwhals.dtypes as nw_dtypes
@@ -17,12 +17,14 @@ from marimo import _loggers
LOGGER = _loggers.marimo_logger()
if sys.version_info < (3, 11):
- from typing_extensions import TypeGuard
+ from typing import TypeGuard
else:
from typing import TypeGuard
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from narwhals.typing import (
IntoBackend,
IntoDataFrame,
diff --git a/marimo/_utils/once.py b/marimo/_utils/once.py
index e51d62a9a1..d2e9029df5 100644
--- a/marimo/_utils/once.py
+++ b/marimo/_utils/once.py
@@ -2,8 +2,9 @@
from __future__ import annotations
import weakref
+from collections.abc import Callable
from functools import wraps
-from typing import Any, Callable, TypeVar, cast
+from typing import Any, TypeVar, cast
F = TypeVar("F", bound=Callable[..., Any])
diff --git a/marimo/_utils/parse_dataclass.py b/marimo/_utils/parse_dataclass.py
index 3cbc64788c..309308cccc 100644
--- a/marimo/_utils/parse_dataclass.py
+++ b/marimo/_utils/parse_dataclass.py
@@ -111,7 +111,8 @@ class _DataclassParser:
)
else:
return origin_cls( # type: ignore # noqa: E501
- self._build_value(v, t) for v, t in zip(value, arg_types)
+ self._build_value(v, t)
+ for v, t in zip(value, arg_types, strict=False)
)
elif origin_cls is dict and isinstance(value, dict):
key_type, value_type = get_args(cls)
diff --git a/marimo/_utils/timer.py b/marimo/_utils/timer.py
index c8d6fe25ff..380b99747d 100644
--- a/marimo/_utils/timer.py
+++ b/marimo/_utils/timer.py
@@ -3,7 +3,10 @@ from __future__ import annotations
import functools
import time
-from typing import Any, Callable
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+ from collections.abc import Callable
def timer(func: Callable[..., Any]) -> Callable[..., Any]:
diff --git a/marimo/_utils/toml.py b/marimo/_utils/toml.py
index e4124069df..bdc931d59b 100644
--- a/marimo/_utils/toml.py
+++ b/marimo/_utils/toml.py
@@ -2,9 +2,10 @@
from __future__ import annotations
import sys
-from typing import IO, TYPE_CHECKING, Any, Callable, Union
+from typing import IO, TYPE_CHECKING, Any, Union
if TYPE_CHECKING:
+ from collections.abc import Callable
from pathlib import Path
# tomllib is available in python 3.11+ and is much faster than tomlkit
diff --git a/marimo/_utils/yaml.py b/marimo/_utils/yaml.py
index 62e4aaa04f..3e074c31be 100644
--- a/marimo/_utils/yaml.py
+++ b/marimo/_utils/yaml.py
@@ -2,7 +2,8 @@
from __future__ import annotations
import re
-from typing import Any, Callable, TypeAlias
+from collections.abc import Callable
+from typing import Any, TypeAlias
import yaml
from yaml.representer import SafeRepresenter, ScalarNode
diff --git a/pyproject.toml b/pyproject.toml
index 7ca8b33947..0c1e34278f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -287,7 +287,7 @@ wheel-exclude = ["marimo/_smoke_tests/**"]
[tool.ruff]
line-length = 79
-target-version = "py39"
+target-version = "py310"
include = ["marimo/**/*.py", "tests/**/*.py", "dagger/**/*.py"]
exclude = [
"build",
diff --git a/tests/_ast/test_toplevel.py b/tests/_ast/test_toplevel.py
index 2544e0d85f..25aaf1cac1 100644
--- a/tests/_ast/test_toplevel.py
+++ b/tests/_ast/test_toplevel.py
@@ -149,7 +149,7 @@ class TestTopLevelExtraction:
@staticmethod
def test_decorator_reversed(app) -> None:
with app.setup:
- from typing import Callable
+ from collections.abc import Callable # noqa: TC003
@app.cell
def second(wrap):
@@ -170,7 +170,7 @@ class TestTopLevelExtraction:
@staticmethod
def test_decorator(app) -> None:
with app.setup:
- from typing import Callable
+ from collections.abc import Callable # noqa: TC003
@app.cell
def first():
diff --git a/tests/_cli/test_cli.py b/tests/_cli/test_cli.py
index 35a7d6b7ad..5ceedad6f3 100644
--- a/tests/_cli/test_cli.py
+++ b/tests/_cli/test_cli.py
@@ -19,7 +19,7 @@ import time
import urllib.error
import urllib.request
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Optional
+from typing import TYPE_CHECKING, Any, Optional
from unittest.mock import patch
import pytest
@@ -43,7 +43,7 @@ from marimo._utils.platform import is_windows
from marimo._utils.toml import toml_reader
if TYPE_CHECKING:
- from collections.abc import Iterator
+ from collections.abc import Callable, Iterator
HAS_UV = DependencyManager.which("uv")
HAS_ZMQ = DependencyManager.zmq.has()
diff --git a/tests/_config/test_manager.py b/tests/_config/test_manager.py
index ec9b4753cb..ef746ca853 100644
--- a/tests/_config/test_manager.py
+++ b/tests/_config/test_manager.py
@@ -1,8 +1,9 @@
from __future__ import annotations
import textwrap
+from collections.abc import Callable
from functools import wraps
-from typing import TYPE_CHECKING, Any, Callable, TypeVar
+from typing import TYPE_CHECKING, Any, TypeVar
from unittest.mock import patch
import pytest
diff --git a/tests/_plugins/ui/_impl/dataframes/test_handlers.py b/tests/_plugins/ui/_impl/dataframes/test_handlers.py
index 95e2afca2e..a687649a4d 100644
--- a/tests/_plugins/ui/_impl/dataframes/test_handlers.py
+++ b/tests/_plugins/ui/_impl/dataframes/test_handlers.py
@@ -112,7 +112,9 @@ def assert_frame_equal_with_nans(
assert len(values_a) == len(values_b), (
f"Length mismatch in column {col}"
)
- for idx, (val_a, val_b) in enumerate(zip(values_a, values_b)):
+ for idx, (val_a, val_b) in enumerate(
+ zip(values_a, values_b, strict=False)
+ ):
both_nan = (
isinstance(val_a, float)
and isinstance(val_b, float)
@@ -157,6 +159,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": ["1", "2", "3"]}),
create_test_dataframes({"A": [1, 2, 3]}),
+ strict=False,
)
),
)
@@ -179,6 +182,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1.1, 2.2, 3.3]}),
create_test_dataframes({"A": ["1.1", "2.2", "3.3"]}),
+ strict=False,
)
),
)
@@ -204,6 +208,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": ["1", "2", "3", "a"]}),
create_test_dataframes({"A": [1, 2, 3, None]}),
+ strict=False,
)
),
)
@@ -226,6 +231,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3]}),
create_test_dataframes({"B": [1, 2, 3]}),
+ strict=False,
)
),
)
@@ -246,6 +252,7 @@ class TestTransformHandler:
create_test_dataframes({"A": [3, 1, 2]}),
create_test_dataframes({"A": [1, 2, 3]}),
create_test_dataframes({"A": [3, 2, 1]}),
+ strict=False,
)
),
)
@@ -279,6 +286,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3]}),
create_test_dataframes({"A": [2, 3]}),
+ strict=False,
)
),
)
@@ -318,6 +326,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [2], "B": [5]}),
+ strict=False,
)
),
)
@@ -339,6 +348,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3, 4, 5]}),
create_test_dataframes({"A": [1, 2, 3]}),
+ strict=False,
)
),
)
@@ -360,6 +370,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3]}),
create_test_dataframes({"A": [1, 3]}),
+ strict=False,
)
),
)
@@ -381,6 +392,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [2, 3], "B": [5, 6]}),
+ strict=False,
)
),
)
@@ -402,6 +414,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [3], "B": [6]}),
+ strict=False,
)
),
)
@@ -428,6 +441,7 @@ class TestTransformHandler:
create_test_dataframes(
{"date": [date(2001, 1, 1)]}, exclude=["pandas"]
),
+ strict=False,
)
),
)
@@ -453,6 +467,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [1, 2], "B": [4, 5]}),
+ strict=False,
)
),
)
@@ -479,6 +494,7 @@ class TestTransformHandler:
create_test_dataframes(
{"date": [date(2001, 1, 1)]}, exclude=["polars"]
),
+ strict=False,
),
],
)
@@ -512,6 +528,7 @@ class TestTransformHandler:
{"A": [Decimal("1.99"), Decimal("3.25")]},
exclude=["pandas"],
),
+ strict=False,
)
),
)
@@ -551,6 +568,7 @@ class TestTransformHandler:
{"A": [Decimal("0.10")]},
exclude=["pandas"],
),
+ strict=False,
)
),
)
@@ -751,6 +769,7 @@ class TestTransformHandler:
{"A": [[1, 2], [3, 4]]}, exclude=["pyarrow"]
),
create_test_dataframes({"A": [[1, 2]]}, exclude=["pyarrow"]),
+ strict=False,
)
),
)
@@ -777,6 +796,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A": [{"a": 1, "b": 2}]}, exclude=["ibis", "pyarrow"]
),
+ strict=False,
)
),
)
@@ -809,6 +829,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A": [{"a": 1, "b": None}]},
),
+ strict=False,
)
),
)
@@ -838,6 +859,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A": [None], "B": [6]}, exclude=["pandas"]
),
+ strict=False,
),
],
)
@@ -859,6 +881,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [3], "B": [6]}),
+ strict=False,
)
),
)
@@ -882,6 +905,7 @@ class TestTransformHandler:
{"A": ["foo", "bar", "baz"], "B": [1, 2, 3]}
),
create_test_dataframes({"A": ["baz"], "B": [3]}),
+ strict=False,
)
),
)
@@ -910,6 +934,7 @@ class TestTransformHandler:
exclude=["ibis"],
),
create_test_dataframes({"A": [3], "B": [6]}, exclude=["ibis"]),
+ strict=False,
),
],
)
@@ -939,6 +964,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A": [3, None], "B": [6, 7]}, exclude=["ibis"]
),
+ strict=False,
),
],
)
@@ -966,6 +992,7 @@ class TestTransformHandler:
{"A": [1, 2, 3, 4, 5], "B": [5, 4, 3, 2, 1]}
),
create_test_dataframes({"A": [3, 4, 5], "B": [3, 2, 1]}),
+ strict=False,
)
),
)
@@ -992,6 +1019,7 @@ class TestTransformHandler:
{"A": [1, 2, 3, 4, 5], "B": [5, 4, 3, 2, 1]}
),
create_test_dataframes({"A": [1, 3, 4, 5], "B": [5, 3, 2, 1]}),
+ strict=False,
)
),
)
@@ -1016,6 +1044,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [True, False, True, False]}),
create_test_dataframes({"A": [True, True]}),
+ strict=False,
)
),
)
@@ -1045,6 +1074,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3]}),
[KeyError],
+ strict=False,
)
),
)
@@ -1070,6 +1100,7 @@ class TestTransformHandler:
create_test_dataframes(
{1: [2, 3], 2: [5, 6]}, include=["pandas"]
),
+ strict=False,
),
],
)
@@ -1177,12 +1208,14 @@ class TestTransformHandler:
{"A": ["foo", "foo", "bar"], "B": [1, 2, 4]}
),
create_test_dataframes({"A": ["foo", "bar"], "B_sum": [3, 4]}),
+ strict=False,
),
*zip(
create_test_dataframes(
{"A": ["foo", "foo", "bar", "bar"], "B": [1, 2, 3, 4]},
),
create_test_dataframes({"A": ["foo", "bar"], "B_sum": [3, 7]}),
+ strict=False,
),
],
)
@@ -1214,6 +1247,7 @@ class TestTransformHandler:
*zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A_sum": [6], "B_sum": [15]}),
+ strict=False,
),
],
)
@@ -1237,6 +1271,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A_min": [1], "B_min": [4], "A_max": [3], "B_max": [6]},
),
+ strict=False,
),
),
)
@@ -1258,6 +1293,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [1, 2, 3]}),
+ strict=False,
)
),
)
@@ -1277,6 +1313,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
+ strict=False,
)
),
)
@@ -1296,6 +1333,7 @@ class TestTransformHandler:
zip(
create_test_dataframes({"A": [1, 2, 3], "B": [4, 5, 6]}),
create_test_dataframes({"A": [2, 3, 1], "B": [5, 6, 4]}),
+ strict=False,
)
),
)
@@ -1365,6 +1403,7 @@ class TestTransformHandler:
create_test_dataframes(
{"B": [1], "foo": [1], "bar": ["hello"]}
),
+ strict=False,
)
),
)
@@ -1411,6 +1450,7 @@ class TestTransformHandler:
create_test_dataframes(
{"A": ["a", "b", "c"], "B": [1, 3, 5]},
),
+ strict=False,
)
],
],
@@ -1511,6 +1551,7 @@ class TestTransformHandler:
aggregation="sum",
)
],
+ strict=False,
),
*zip(
create_test_dataframes(
@@ -1568,6 +1609,7 @@ class TestTransformHandler:
aggregation="sum",
)
],
+ strict=False,
),
*zip(
create_test_dataframes(
@@ -1610,6 +1652,7 @@ class TestTransformHandler:
aggregation="sum",
)
],
+ strict=False,
),
*zip(
create_test_dataframes(
@@ -1645,6 +1688,7 @@ class TestTransformHandler:
aggregation="sum",
)
],
+ strict=False,
),
],
)
@@ -1692,6 +1736,7 @@ class TestTransformHandler:
create_test_dataframes({"A": [1, 2, 3], "B": [4, 6, 5]}),
create_test_dataframes({"A": [3, 2], "B": [5, 6]}),
create_test_dataframes({"A": [2], "B": [6]}),
+ strict=False,
)
),
)
@@ -1855,6 +1900,7 @@ class TestTransformHandler:
create_test_dataframes(
{"date": [date(2001, 1, 1)]}, exclude=["pyarrow"]
),
+ strict=False,
)
),
)
@@ -1900,6 +1946,7 @@ class TestTransformHandler:
create_test_dataframes(
{"nulls": [float("nan")]}, include=["pandas"]
),
+ strict=False,
)
),
)
@@ -1929,6 +1976,7 @@ class TestTransformHandler:
{"nulls": [1, 2, 3, None, "hello"]}, include=["pandas"]
),
create_test_dataframes({"nulls": [None]}, include=["pandas"]),
+ strict=False,
)
),
)
@@ -1962,6 +2010,7 @@ class TestTransformHandler:
create_test_dataframes(
{"nulls": [float("nan")]}, exclude=["pandas", "ibis"]
),
+ strict=False,
)
),
)
@@ -1992,6 +2041,7 @@ class TestTransformHandler:
strict=False,
),
create_test_dataframes({"nulls": [float("inf")]}),
+ strict=False,
)
),
)
@@ -2022,6 +2072,7 @@ class TestTransformHandler:
strict=False,
),
create_test_dataframes({"nulls": [float("-inf")]}),
+ strict=False,
)
),
)
@@ -2063,6 +2114,7 @@ class TestTransformHandler:
{"nulls": [float("nan"), float("inf"), None]},
include=["pandas"],
),
+ strict=False,
)
),
)
@@ -2105,6 +2157,7 @@ class TestTransformHandler:
{"nulls": [float("nan"), float("inf"), None]},
exclude=["pandas", "ibis"],
),
+ strict=False,
)
),
)
diff --git a/tests/_plugins/ui/_impl/test_array.py b/tests/_plugins/ui/_impl/test_array.py
index aa72fd5714..c015eff00e 100644
--- a/tests/_plugins/ui/_impl/test_array.py
+++ b/tests/_plugins/ui/_impl/test_array.py
@@ -87,7 +87,7 @@ def test_container_emulation() -> None:
assert array[0] == array.elements[0]
assert array[1] == array.elements[1]
# iter
- for a, b in zip(array, array.elements):
+ for a, b in zip(array, array.elements, strict=False):
assert a == b
# contains
assert array[0] in array
diff --git a/tests/_plugins/ui/_impl/test_dictionary.py b/tests/_plugins/ui/_impl/test_dictionary.py
index bcc212c5c7..29a9e9b297 100644
--- a/tests/_plugins/ui/_impl/test_dictionary.py
+++ b/tests/_plugins/ui/_impl/test_dictionary.py
@@ -65,7 +65,7 @@ def test_container_emulation() -> None:
assert d["0"] == d.elements["0"]
assert d["1"] == d.elements["1"]
# iter
- for a, b in zip(d, d.elements):
+ for a, b in zip(d, d.elements, strict=False):
assert a == b
# contains
assert "0" in d
diff --git a/tests/_plugins/ui/_impl/test_plotly.py b/tests/_plugins/ui/_impl/test_plotly.py
index f552ac0595..e54191b0f4 100644
--- a/tests/_plugins/ui/_impl/test_plotly.py
+++ b/tests/_plugins/ui/_impl/test_plotly.py
@@ -770,7 +770,7 @@ def test_heatmap_numpy_and_fallback_produce_same_results() -> None:
fallback_sorted = sorted(fallback_result, key=sort_key)
# Compare each cell
- for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted):
+ for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_cell["x"] == fb_cell["x"]
assert np_cell["y"] == fb_cell["y"]
assert np_cell["z"] == fb_cell["z"]
@@ -863,7 +863,7 @@ def test_heatmap_numpy_and_fallback_datetime_x_axis() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted):
+ for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_cell["x"] == fb_cell["x"]
assert np_cell["y"] == fb_cell["y"]
assert np_cell["z"] == fb_cell["z"]
@@ -922,7 +922,7 @@ def test_scatter_numpy_and_fallback_datetime_x_axis() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_p, fb_p in zip(numpy_sorted, fallback_sorted):
+ for np_p, fb_p in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_p["x"] == fb_p["x"]
assert np_p["y"] == fb_p["y"]
@@ -1002,7 +1002,7 @@ def test_bar_numpy_and_fallback_datetime_x_axis() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted):
+ for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_bar["x"] == fb_bar["x"]
assert np_bar["y"] == fb_bar["y"]
@@ -1601,7 +1601,7 @@ def test_scatter_points_numpy_and_fallback() -> None:
fallback_sorted = sorted(fallback_result, key=sort_key)
# Compare each point
- for np_point, fb_point in zip(numpy_sorted, fallback_sorted):
+ for np_point, fb_point in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_point["x"] == fb_point["x"]
assert np_point["y"] == fb_point["y"]
assert np_point["curveNumber"] == fb_point["curveNumber"]
@@ -1705,7 +1705,7 @@ def test_scattergl_points_numpy_and_fallback() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_point, fb_point in zip(numpy_sorted, fallback_sorted):
+ for np_point, fb_point in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_point["x"] == fb_point["x"]
assert np_point["y"] == fb_point["y"]
assert np_point["curveNumber"] == fb_point["curveNumber"]
@@ -2578,7 +2578,7 @@ def test_bar_numpy_and_fallback_match_categorical() -> None:
fallback_sorted = sorted(fallback_result, key=sort_key)
# Compare each bar
- for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted):
+ for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_bar["x"] == fb_bar["x"]
assert np_bar["y"] == fb_bar["y"]
assert np_bar["curveNumber"] == fb_bar["curveNumber"]
@@ -2607,7 +2607,7 @@ def test_bar_numpy_and_fallback_match_numeric() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted):
+ for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_bar["x"] == fb_bar["x"]
assert np_bar["y"] == fb_bar["y"]
assert np_bar["curveNumber"] == fb_bar["curveNumber"]
@@ -2637,7 +2637,7 @@ def test_bar_numpy_and_fallback_match_horizontal() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted):
+ for np_bar, fb_bar in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_bar["x"] == fb_bar["x"]
assert np_bar["y"] == fb_bar["y"]
assert np_bar["curveNumber"] == fb_bar["curveNumber"]
@@ -2659,7 +2659,7 @@ def test_histogram_numpy_and_fallback_match_numeric() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_point, fb_point in zip(numpy_sorted, fallback_sorted):
+ for np_point, fb_point in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_point == fb_point
@@ -2742,7 +2742,7 @@ def test_histogram_numpy_and_fallback_match_categorical() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_point, fb_point in zip(numpy_sorted, fallback_sorted):
+ for np_point, fb_point in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_point == fb_point
@@ -2774,7 +2774,7 @@ def test_heatmap_numpy_and_fallback_numeric_axes() -> None:
numpy_sorted = sorted(numpy_result, key=sort_key)
fallback_sorted = sorted(fallback_result, key=sort_key)
- for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted):
+ for np_cell, fb_cell in zip(numpy_sorted, fallback_sorted, strict=False):
assert np_cell["x"] == fb_cell["x"]
assert np_cell["y"] == fb_cell["y"]
assert np_cell["z"] == fb_cell["z"]
@@ -3249,6 +3249,7 @@ def test_waterfall_numpy_and_fallback_match() -> None:
for np_pt, fb_pt in zip(
sorted(numpy_result, key=lambda p: p["pointIndex"]),
sorted(fallback_result, key=lambda p: p["pointIndex"]),
+ strict=False,
):
assert np_pt["x"] == fb_pt["x"]
assert np_pt["y"] == fb_pt["y"]
diff --git a/tests/_plugins/ui/_impl/test_ui_mpl.py b/tests/_plugins/ui/_impl/test_ui_mpl.py
index e1ee40a3ff..cbe3d26e74 100644
--- a/tests/_plugins/ui/_impl/test_ui_mpl.py
+++ b/tests/_plugins/ui/_impl/test_ui_mpl.py
@@ -289,7 +289,7 @@ def test_axes_bounds_match_constrained_layout() -> None:
bbox.x1 * w,
(1 - bbox.y0) * h,
]
- for actual, exp in zip(args["axes-pixel-bounds"], expected):
+ for actual, exp in zip(args["axes-pixel-bounds"], expected, strict=False):
assert abs(actual - exp) < 1e-6
@@ -320,7 +320,7 @@ def test_axes_bounds_match_tight_layout() -> None:
bbox.x1 * w,
(1 - bbox.y0) * h,
]
- for actual, exp in zip(args["axes-pixel-bounds"], expected):
+ for actual, exp in zip(args["axes-pixel-bounds"], expected, strict=False):
assert abs(actual - exp) < 1e-6
diff --git a/tests/_pyodide/test_bootstrap.py b/tests/_pyodide/test_bootstrap.py
index 9d77069845..645bbf6617 100644
--- a/tests/_pyodide/test_bootstrap.py
+++ b/tests/_pyodide/test_bootstrap.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import json
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
import pytest
@@ -15,6 +15,7 @@ from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
+ from collections.abc import Callable
from pathlib import Path
diff --git a/tests/_runtime/test_pytest_runtime.py b/tests/_runtime/test_pytest_runtime.py
index 864a0be71c..a7b1d9c0ea 100644
--- a/tests/_runtime/test_pytest_runtime.py
+++ b/tests/_runtime/test_pytest_runtime.py
@@ -109,7 +109,9 @@ def test_isolation_cells(notebook_env):
defs=cell.defs, lcls=lcls, notebook_path=path
)
expected = tuple(
- map(sum, zip(*[_DEF_COUNT[d] for d in cell.defs]))
+ map(
+ sum, zip(*[_DEF_COUNT[d] for d in cell.defs], strict=False)
+ )
)
assert (
response.passed,
diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.py
index a6eb1f08be..1d31e717ca 100644
--- a/tests/_server/api/endpoints/test_ws.py
+++ b/tests/_server/api/endpoints/test_ws.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import asyncio
from contextlib import contextmanager
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable
+from typing import TYPE_CHECKING, Any
from unittest.mock import MagicMock, patch
import pytest
@@ -31,6 +31,8 @@ from tests._server.conftest import get_kernel_tasks, get_user_config_manager
from tests._server.mocks import get_session_manager
if TYPE_CHECKING:
+ from collections.abc import Callable
+
from starlette.testclient import TestClient, WebSocketTestSession
diff --git a/tests/_server/mocks.py b/tests/_server/mocks.py
index ded3dac375..6380a8d4f2 100644
--- a/tests/_server/mocks.py
+++ b/tests/_server/mocks.py
@@ -4,7 +4,7 @@ from __future__ import annotations
import base64
import contextlib
import tempfile
-from typing import TYPE_CHECKING, Any, Callable, Optional, cast
+from typing import TYPE_CHECKING, Any, Optional, cast
from marimo._config.manager import (
MarimoConfigManager,
@@ -20,7 +20,7 @@ from marimo._session.model import SessionMode
from marimo._utils.marimo_path import MarimoPath
if TYPE_CHECKING:
- from collections.abc import Iterator
+ from collections.abc import Callable, Iterator
from starlette.testclient import TestClient
diff --git a/tests/_server/test_sessions.py b/tests/_server/test_sessions.py
index 08c2314d24..7052a24354 100644
--- a/tests/_server/test_sessions.py
+++ b/tests/_server/test_sessions.py
@@ -9,11 +9,12 @@ import queue
import sys
import threading
import time
+from collections.abc import Callable
from multiprocessing.queues import Queue as MPQueue
from pathlib import Path
from tempfile import NamedTemporaryFile
from textwrap import dedent
-from typing import Any, Callable, TypeVar
+from typing import Any, TypeVar
from unittest.mock import MagicMock
import pytest
diff --git a/tests/_session/state/test_session_view.py b/tests/_session/state/test_session_view.py
index 2994f51727..d23b9b8b3c 100644
--- a/tests/_session/state/test_session_view.py
+++ b/tests/_session/state/test_session_view.py
@@ -459,6 +459,7 @@ class TestModelReplayState:
zip(
[tuple(p) for p in msg.buffer_paths],
msg.buffers,
+ strict=False,
)
)
assert path_buf == {("img",): b"png", ("data",): b"csv"}
diff --git a/tests/_sql/test_connection_utils.py b/tests/_sql/test_connection_utils.py
index 1dfdac7a5f..1ae69b97fe 100644
--- a/tests/_sql/test_connection_utils.py
+++ b/tests/_sql/test_connection_utils.py
@@ -2,7 +2,7 @@
from __future__ import annotations
import time
-from typing import Callable
+from typing import TYPE_CHECKING
import pytest
@@ -20,6 +20,9 @@ from marimo._sql.connection_utils import (
update_table_list_in_connection,
)
+if TYPE_CHECKING:
+ from collections.abc import Callable
+
TIME_THRESHOLD_SECONDS = 0.1
diff --git a/tests/_utils/test_lifespans.py b/tests/_utils/test_lifespans.py
index 35e45ef5d8..e345a6339c 100644
--- a/tests/_utils/test_lifespans.py
+++ b/tests/_utils/test_lifespans.py
@@ -1,7 +1,6 @@
import asyncio
-from collections.abc import AsyncIterator
+from collections.abc import AsyncIterator, Callable
from contextlib import asynccontextmanager
-from typing import Callable
import pytest
diff --git a/tests/utils.py b/tests/utils.py
index 9359e86ad0..2fa40c0515 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -11,7 +11,7 @@ from marimo._messaging.msgspec_encoder import (
from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
- from typing import Callable
+ from collections.abc import Callable
import msgspec