A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
fix(reload): exclude marimo package from modulefinder crawl (#10249)
Bartok89d25f5779eb
diff --git a/marimo/_runtime/reload/module_watcher.py b/marimo/_runtime/reload/module_watcher.pyindex 9b765883d1..6d7a50c60a 100644--- a/marimo/_runtime/reload/module_watcher.py+++ b/marimo/_runtime/reload/module_watcher.py@@ -84,6 +84,11 @@ def _is_third_party_module(module: types.ModuleType) -> bool:return "site-packages" in pathlib.Path(filepath).parts+def _is_marimo_internal_module_name(modname: str) -> bool:+ """True for marimo and any marimo.* submodule name."""+ return modname == "marimo" or modname.startswith("marimo.")++# Cache for excluded modules to avoid recomputing on every check# Only caches most recent result to prevent memory bloat_excluded_modules_cache: tuple[frozenset[str], set[str]] | None = None@@ -102,9 +107,14 @@ def _get_excluded_modules(modules: dict[str, types.ModuleType]) -> set[str]:result = {modnamefor modname in modules- if (m := modules.get(modname)) is not None- and _is_third_party_module(m)+ if _is_marimo_internal_module_name(modname)+ or (+ (m := modules.get(modname)) is not None+ and _is_third_party_module(m)+ )}+ # Always exclude the root package name even when absent from ``modules``.+ result.add("marimo")_excluded_modules_cache = (cache_key, result)return resultdiff --git a/tests/_runtime/reload/test_module_watcher.py b/tests/_runtime/reload/test_module_watcher.pyindex 450068032a..27e872a538 100644--- a/tests/_runtime/reload/test_module_watcher.py+++ b/tests/_runtime/reload/test_module_watcher.py@@ -841,6 +841,44 @@ class TestGetExcludedModules:assert "third_party" in resultassert "local_mod" not in result+ def test_get_excluded_modules_always_excludes_marimo_package(self):+ """Editable marimo is not under site-packages; still exclude it (#10225)."""+ from marimo._runtime.reload import module_watcher as mw++ # Bust cache from previous tests+ mw._excluded_modules_cache = None++ local = types.ModuleType("local_mod")+ local.__file__ = "/home/user/project/local_mod.py"++ marimo_mod = types.ModuleType("marimo")+ marimo_mod.__file__ = "/home/user/dev/marimo/marimo/__init__.py"++ marimo_sub = types.ModuleType("marimo._runtime")+ marimo_sub.__file__ = (+ "/home/user/dev/marimo/marimo/_runtime/__init__.py"+ )++ modules = {+ "local_mod": local,+ "marimo": marimo_mod,+ "marimo._runtime": marimo_sub,+ }+ result = _get_excluded_modules(modules)+ assert "marimo" in result+ assert "marimo._runtime" in result+ assert "local_mod" not in result++ def test_is_marimo_internal_module_name(self):+ from marimo._runtime.reload.module_watcher import (+ _is_marimo_internal_module_name,+ )++ assert _is_marimo_internal_module_name("marimo")+ assert _is_marimo_internal_module_name("marimo._runtime")+ assert not _is_marimo_internal_module_name("marimo_tools")+ assert not _is_marimo_internal_module_name("local_mod")+def test_get_excluded_modules_caching(self):"""Test _get_excluded_modules uses cache"""mod1 = types.ModuleType("mod1")@@ -876,14 +914,19 @@ class TestGetExcludedModules:assert "mod2" in result2def test_get_excluded_modules_empty(self):- """Test _get_excluded_modules with no third-party modules"""+ """Local-only modules still exclude bare marimo for modulefinder."""+ from marimo._runtime.reload import module_watcher as mw++ mw._excluded_modules_cache = None+mod1 = types.ModuleType("local_mod")mod1.__file__ = "/home/user/project/local_mod.py"modules = {"local_mod": mod1}result = _get_excluded_modules(modules)- assert result == set()+ # Root package is always excluded even when not present in modules.+ assert result == {"marimo"}class TestCheckModules: