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: allow for cache hits from external modules (#6731)
Dylan Madisetti9e7c3468d660
diff --git a/marimo/_save/loaders/loader.py b/marimo/_save/loaders/loader.pyindex 89aba1ba84..903f553462 100644--- a/marimo/_save/loaders/loader.py+++ b/marimo/_save/loaders/loader.py@@ -108,7 +108,8 @@ class Loader(ABC):"""def __init__(self, name: str) -> None:- self.name = name+ # Remove * since used to prevent shadowing in scoped cases.+ self.name = name.strip("*")self._hits = 0self._time_saved = 0.0@@ -212,7 +213,7 @@ class BasePersistenceLoader(Loader):self.store = DEFAULT_STORE()# Limited character set for path for windows compatibility- self.name = re.sub(r"[^a-zA-Z0-9 _-]", "_", name)+ self.name = re.sub(r"[^a-zA-Z0-9 _-]", "_", self.name)self.suffix = suffixdef build_path(self, key: HashKey) -> Path:diff --git a/tests/_save/test_external_decorators.py b/tests/_save/test_external_decorators.pyindex 5bf178d304..0f18050067 100644--- a/tests/_save/test_external_decorators.py+++ b/tests/_save/test_external_decorators.py@@ -10,6 +10,45 @@ from tests.conftest import ExecReqProviderclass TestDecoratorImports:+ @staticmethod+ def test_import_alias_hash_path(app) -> None:+ """Test that imported cached functions with module aliases have correct hash paths."""+ for module in list(sys.modules.keys()):+ if module.startswith("tests._save.external_decorators"):+ del sys.modules[module]++ with app.setup:+ import marimo as mo+ import tests._save.external_decorators.module_1 as my_module+ from tests._save.external_decorators.transitive_imports import (+ doesnt_have_namespace as external_func,+ )++ @app.function+ @mo.cache+ def doesnt_have_namespace() -> None:+ # Just replicating the function in external_func+ return my_module.__version__++ @app.cell+ def check_hash_paths() -> None:+ local_func = doesnt_have_namespace+ # Both functions access the same module with the same alias+ external_result = external_func()+ local_result = local_func()++ # Results should be the same (both return "1.0.0")+ assert external_result == local_result == "1.0.0"++ # Hashes should be equal (same code, same module accessed)+ external_name = external_func._loader().name+ local_name = local_func._loader().name++ assert external_name == local_name, (+ f"Hashes should be equal for same code and module, "+ f"got {external_name} != {local_name}"+ )+@staticmethoddef test_has_shared_import(app) -> None:with app.setup: