fix bad merge

Author: akshayka

marimo/_session/extensions/extensions.py

@@ -8,6 +8,7 @@
 from __future__ import annotations
 
 import asyncio
+from enum import Enum
 from typing import TYPE_CHECKING, Optional
 
 from marimo import _loggers
@@ -97,6 +98,11 @@ def _stop(self) -> None:
             self.heartbeat_task.cancel()
 
 
+class CacheMode(Enum):
+    READ = "read"
+    READ_WRITE = "write"
+
+
 class CachingExtension(SessionExtension, SessionEventListener):
     """Extension for caching session state to disk.
 
@@ -111,15 +117,18 @@ def __init__(
         *,
         enabled: bool,
         interval: int = SESSION_CACHE_INTERVAL_SECONDS,
+        mode: CacheMode = CacheMode.READ_WRITE,
     ) -> None:
         """Initialize the caching extension.
 
         Args:
             enabled: Whether to enable caching
             interval: How often to write cache (in seconds)
+            mode: Whether to read cache only or read/write.
         """
         self.interval = interval
         self.enabled = enabled
+        self.mode = mode
         self.session_cache_manager: Optional[SessionCacheManager] = None
         self.event_bus: Optional[SessionEventBus] = None
 
@@ -165,7 +174,8 @@ def on_attach(self, session: Session, event_bus: SessionEventBus) -> None:
         )
 
         # Start the background task to write the session view to disk
-        self.session_cache_manager.start()
+        if self.mode is CacheMode.READ_WRITE:
+            self.session_cache_manager.start()
 
     def on_detach(self) -> None:
         """Stop cache manager when detached."""
@@ -179,6 +189,8 @@ async def on_session_notebook_renamed(
     ) -> None:
         """Rename the path for the cache manager."""
         del old_path
+        if self.mode is not CacheMode.READ_WRITE:
+            return None
         path = session.app_file_manager.path
         if self.session_cache_manager and path:
             self.session_cache_manager.rename_path(path)

marimo/_session/session.py

@@ -29,6 +29,7 @@
 from marimo._session.consumer import SessionConsumer
 from marimo._session.events import SessionEventBus
 from marimo._session.extensions.extensions import (
+    CacheMode,
     CachingExtension,
     HeartbeatExtension,
     LoggingExtension,
@@ -171,12 +172,22 @@ def create(
                 redirect_console_to_browser=redirect_console_to_browser,
             )
 
+        if mode == SessionMode.EDIT:
+            cache_enabled = not auto_instantiate
+            cache_mode = CacheMode.READ_WRITE
+        else:
+            cache_enabled = config_manager.get_config()["runtime"].get(
+                "serve_cached_sessions_in_apps", False
+            )
+            cache_mode = CacheMode.READ
+
         extensions = [
             *(extensions or []),
             LoggingExtension(),
             HeartbeatExtension(),
             CachingExtension(
-                enabled=not auto_instantiate and mode == SessionMode.EDIT
+                enabled=cache_enabled,
+                mode=cache_mode,
             ),
             NotificationListenerExtension(
                 kernel_manager=kernel_manager, queue_manager=queue_manager

tests/_session/app_host/test_app_host.py

@@ -420,6 +420,7 @@ def test_create_session_uses_per_client_session_id(self) -> None:
         """
         from unittest.mock import Mock, patch
 
+        from marimo._config.config import DEFAULT_CONFIG
         from marimo._session.app_host import AppHostContext
         from marimo._session.app_host.host import AppHost
         from marimo._session.model import SessionMode
@@ -444,7 +445,11 @@ def test_create_session_uses_per_client_session_id(self) -> None:
                     app_file_manager=Mock(path="/tmp/test_app.py"),
                     config_manager=Mock(
                         with_overrides=Mock(
-                            return_value=Mock(get_config=Mock(return_value={}))
+                            return_value=Mock(
+                                get_config=Mock(
+                                    return_value=DEFAULT_CONFIG
+                                )
+                            )
                         )
                     ),
                     virtual_files_supported=True,