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.

refactor: move session files (#7626)

Myles Scolnicka254045abb68
diff --git a/development_docs/adding_backend_and_mcp_tools.md b/development_docs/adding_backend_and_mcp_tools.md
index 75d94835e0..0e02b76c1a 100644
--- a/development_docs/adding_backend_and_mcp_tools.md
+++ b/development_docs/adding_backend_and_mcp_tools.md
@@ -76,7 +76,7 @@ from marimo._ai._tools.utils.exceptions import ToolExecutionError
from marimo._types.ids import SessionId
if TYPE_CHECKING:
- from marimo._server.sessions import Session
+ from marimo._session import Session
@dataclass
diff --git a/marimo/_ai/_tools/base.py b/marimo/_ai/_tools/base.py
index ae4597a68b..7462d66484 100644
--- a/marimo/_ai/_tools/base.py
+++ b/marimo/_ai/_tools/base.py
@@ -35,7 +35,7 @@ from marimo._server.ai.tools.types import (
ValidationFunction,
)
from marimo._server.api.deps import AppStateBase
-from marimo._server.model import ConnectionState
+from marimo._session.model import ConnectionState
from marimo._types.ids import CellId_t, SessionId
from marimo._utils.case import to_snake_case
from marimo._utils.dataclass_to_openapi import PythonTypeToOpenAPI
@@ -54,7 +54,8 @@ if TYPE_CHECKING:
from starlette.applications import Starlette
- from marimo._server.sessions import Session, SessionManager
+ from marimo._server.session_manager import SessionManager
+ from marimo._session import Session
@dataclass
diff --git a/marimo/_ai/_tools/tools/cells.py b/marimo/_ai/_tools/tools/cells.py
index fbc6f32101..d765a583dd 100644
--- a/marimo/_ai/_tools/tools/cells.py
+++ b/marimo/_ai/_tools/tools/cells.py
@@ -23,7 +23,7 @@ from marimo._types.ids import CellId_t, SessionId
if TYPE_CHECKING:
from marimo._ast.models import CellData
- from marimo._server.sessions import Session
+ from marimo._session import Session
class SupportedCellType(str, Enum):
diff --git a/marimo/_ai/_tools/tools/datasource.py b/marimo/_ai/_tools/tools/datasource.py
index f3be0115ac..5e64f4ae3c 100644
--- a/marimo/_ai/_tools/tools/datasource.py
+++ b/marimo/_ai/_tools/tools/datasource.py
@@ -17,7 +17,7 @@ from marimo._utils.fuzzy_match import compile_regex, is_fuzzy_match
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from marimo._server.sessions import Session
+ from marimo._session import Session
@dataclass
diff --git a/marimo/_ai/_tools/tools/tables_and_variables.py b/marimo/_ai/_tools/tools/tables_and_variables.py
index 87a9593567..891156fc19 100644
--- a/marimo/_ai/_tools/tools/tables_and_variables.py
+++ b/marimo/_ai/_tools/tools/tables_and_variables.py
@@ -8,7 +8,7 @@ from marimo._ai._tools.base import ToolBase
from marimo._ai._tools.types import SuccessResult, ToolGuidelines
from marimo._data.models import DataTableColumn
from marimo._messaging.notification import VariableValue
-from marimo._server.sessions import Session
+from marimo._session import Session
from marimo._types.ids import SessionId
diff --git a/marimo/_ai/text_to_notebook.py b/marimo/_ai/text_to_notebook.py
index d36f6d9bde..9d51f27a03 100644
--- a/marimo/_ai/text_to_notebook.py
+++ b/marimo/_ai/text_to_notebook.py
@@ -11,7 +11,7 @@ from marimo._config.cli_state import (
get_cli_state,
write_cli_state,
)
-from marimo._server.utils import print_
+from marimo._utils.print import print_
TERMS = """
Before using marimo's Text-To-Notebook AI feature, you should know:
diff --git a/marimo/_cli/cli.py b/marimo/_cli/cli.py
index 13854aa6fd..0eb8442fc2 100644
--- a/marimo/_cli/cli.py
+++ b/marimo/_cli/cli.py
@@ -34,8 +34,8 @@ from marimo._cli.utils import (
from marimo._config.settings import GLOBAL_SETTINGS
from marimo._lint import run_check
from marimo._server.file_router import AppFileRouter
-from marimo._server.model import SessionMode
from marimo._server.start import start
+from marimo._session.model import SessionMode
from marimo._tutorials import (
Tutorial,
create_temp_tutorial_file,
diff --git a/marimo/_cli/development/commands.py b/marimo/_cli/development/commands.py
index 032cac055e..5c2b33c5b3 100644
--- a/marimo/_cli/development/commands.py
+++ b/marimo/_cli/development/commands.py
@@ -17,7 +17,7 @@ from marimo._data.models import DataType
from marimo._messaging.errors import Error as MarimoError
from marimo._messaging.notification import NotificationMessage
from marimo._runtime.commands import CommandMessage
-from marimo._server.session.serialize import (
+from marimo._session.state.serialize import (
serialize_notebook,
serialize_session_view,
)
@@ -177,7 +177,6 @@ def _generate_server_api_schema() -> dict[str, Any]:
packages.ListPackagesResponse,
packages.PackageOperationResponse,
packages.RemovePackageRequest,
- packages.DependencyTreeNode,
packages.DependencyTreeResponse,
home.OpenTutorialRequest,
home.RecentFilesResponse,
diff --git a/marimo/_ipc/connection.py b/marimo/_ipc/connection.py
index c201e0611f..b4073afb59 100644
--- a/marimo/_ipc/connection.py
+++ b/marimo/_ipc/connection.py
@@ -13,7 +13,7 @@ import zmq
from marimo import _loggers
from marimo._ipc.queue_proxy import PushQueue, start_receiver_thread
from marimo._ipc.types import ConnectionInfo
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
if typing.TYPE_CHECKING:
from marimo._messaging.types import KernelMessage
diff --git a/marimo/_ipc/queue_manager.py b/marimo/_ipc/queue_manager.py
index 27fb9ef875..0f3b6feccf 100644
--- a/marimo/_ipc/queue_manager.py
+++ b/marimo/_ipc/queue_manager.py
@@ -16,7 +16,7 @@ if typing.TYPE_CHECKING:
CommandMessage,
UpdateUIElementCommand,
)
- from marimo._server.types import QueueType
+ from marimo._session.queue import QueueType
@dataclasses.dataclass
diff --git a/marimo/_ipc/queue_proxy.py b/marimo/_ipc/queue_proxy.py
index ffdf53d94d..62dac6d25d 100644
--- a/marimo/_ipc/queue_proxy.py
+++ b/marimo/_ipc/queue_proxy.py
@@ -10,7 +10,7 @@ import typing
import zmq
from marimo import _loggers
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_islands/_island_generator.py b/marimo/_islands/_island_generator.py
index 1ce6e98c95..8eb42cf2d6 100644
--- a/marimo/_islands/_island_generator.py
+++ b/marimo/_islands/_island_generator.py
@@ -14,8 +14,7 @@ from marimo._ast.cell import Cell, CellConfig
from marimo._ast.compiler import compile_cell
from marimo._messaging.cell_output import CellOutput
from marimo._output.utils import uri_encode_component
-from marimo._server.file_router import AppFileRouter
-from marimo._server.notebook import AppFileManager
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import CellId_t
from marimo._utils.marimo_path import MarimoPath
from marimo._version import __version__
@@ -24,7 +23,7 @@ if sys.platform == "win32": # handling for windows
asyncio.set_event_loop_policy(asyncio.WindowsSelectorEventLoopPolicy())
if TYPE_CHECKING:
- from marimo._server.session.session_view import SessionView
+ from marimo._session.state.session_view import SessionView
LOGGER = _loggers.marimo_logger()
@@ -267,6 +266,8 @@ class MarimoIslandGenerator:
- filename (str): Marimo .py filename to convert to reactive HTML.
- display_code (bool): Whether to display the code in HTML snippets.
"""
+ from marimo._server.file_router import AppFileRouter
+
path = MarimoPath(filename)
file_router = AppFileRouter.from_filename(path)
file_key = file_router.get_unique_file_key()
diff --git a/marimo/_messaging/streams.py b/marimo/_messaging/streams.py
index 9eb978a271..23c16b2c84 100644
--- a/marimo/_messaging/streams.py
+++ b/marimo/_messaging/streams.py
@@ -24,7 +24,7 @@ from marimo._messaging.types import (
Stdout,
Stream,
)
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
diff --git a/marimo/_plugins/stateless/mpl/_mpl.py b/marimo/_plugins/stateless/mpl/_mpl.py
index aaa7ff0cbe..1d6974f571 100644
--- a/marimo/_plugins/stateless/mpl/_mpl.py
+++ b/marimo/_plugins/stateless/mpl/_mpl.py
@@ -29,7 +29,6 @@ from marimo._runtime.context import (
)
from marimo._runtime.context.kernel_context import KernelRuntimeContext
from marimo._runtime.runtime import app_meta
-from marimo._server.utils import find_free_port
from marimo._utils.platform import is_pyodide
LOGGER = _loggers.marimo_logger()
@@ -96,6 +95,8 @@ class MplServerManager:
# Find a free port, with some randomization to avoid conflicts
import random
+ from marimo._server.utils import find_free_port
+
base_port = 10_000 + random.randint(0, 1000) # Add some randomization
port = (
free_port if free_port is not None else find_free_port(base_port)
diff --git a/marimo/_pyodide/bootstrap.py b/marimo/_pyodide/bootstrap.py
index 20e2bb5c9c..de91ad5e02 100644
--- a/marimo/_pyodide/bootstrap.py
+++ b/marimo/_pyodide/bootstrap.py
@@ -20,9 +20,9 @@ from marimo._runtime.commands import (
SerializedQueryParams,
UpdateUIElementCommand,
)
-from marimo._server.model import SessionMode
from marimo._server.models.models import SaveNotebookRequest
-from marimo._server.notebook import AppFileManager
+from marimo._session.model import SessionMode
+from marimo._session.notebook import AppFileManager
from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
diff --git a/marimo/_pyodide/pyodide_session.py b/marimo/_pyodide/pyodide_session.py
index 690a6878b7..b4b5171b26 100644
--- a/marimo/_pyodide/pyodide_session.py
+++ b/marimo/_pyodide/pyodide_session.py
@@ -44,7 +44,6 @@ from marimo._runtime.utils.set_ui_element_request_manager import (
)
from marimo._server.export.exporter import Exporter
from marimo._server.files.os_file_system import OSFileSystem
-from marimo._server.model import SessionMode
from marimo._server.models.export import ExportAsHTMLRequest
from marimo._server.models.files import (
FileCreateRequest,
@@ -69,7 +68,8 @@ from marimo._server.models.models import (
SaveNotebookRequest,
SaveUserConfigurationRequest,
)
-from marimo._server.session.session_view import SessionView
+from marimo._session.model import SessionMode
+from marimo._session.state.session_view import SessionView
from marimo._snippets.snippets import read_snippets
from marimo._utils.formatter import DefaultFormatter
from marimo._utils.inline_script_metadata import PyProjectReader
@@ -78,7 +78,7 @@ from marimo._utils.parse_dataclass import parse_raw
if TYPE_CHECKING:
from marimo._ast.cell import CellConfig
from marimo._messaging.types import KernelMessage
- from marimo._server.notebook.file_manager import AppFileManager
+ from marimo._session.notebook.file_manager import AppFileManager
from marimo._types.ids import CellId_t
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_runtime/app/kernel_runner.py b/marimo/_runtime/app/kernel_runner.py
index 9316e664d9..b54d26e18e 100644
--- a/marimo/_runtime/app/kernel_runner.py
+++ b/marimo/_runtime/app/kernel_runner.py
@@ -16,7 +16,7 @@ from marimo._runtime.commands import (
from marimo._runtime.context.types import get_context
from marimo._runtime.patches import create_main_module
from marimo._runtime.runner import cell_runner
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
diff --git a/marimo/_runtime/complete.py b/marimo/_runtime/complete.py
index 9e263c195b..96e0dce2c8 100644
--- a/marimo/_runtime/complete.py
+++ b/marimo/_runtime/complete.py
@@ -22,7 +22,7 @@ from marimo._messaging.types import Stream
from marimo._output.md import _md
from marimo._runtime import dataflow
from marimo._runtime.commands import CodeCompletionCommand
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
from marimo._utils.docs import MarimoConverter
from marimo._utils.format_signature import format_signature
from marimo._utils.rst_to_html import convert_rst_to_html
diff --git a/marimo/_runtime/context/kernel_context.py b/marimo/_runtime/context/kernel_context.py
index 6dc4f7039e..f1a6a59558 100644
--- a/marimo/_runtime/context/kernel_context.py
+++ b/marimo/_runtime/context/kernel_context.py
@@ -18,7 +18,7 @@ from marimo._runtime.context.types import (
from marimo._runtime.dataflow import DirectedGraph
from marimo._runtime.functions import FunctionRegistry
from marimo._runtime.params import CLIArgs, QueryParams
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
if TYPE_CHECKING:
from collections.abc import Iterator
diff --git a/marimo/_runtime/context/utils.py b/marimo/_runtime/context/utils.py
index b877df31b9..90df5f1e8c 100644
--- a/marimo/_runtime/context/utils.py
+++ b/marimo/_runtime/context/utils.py
@@ -6,7 +6,7 @@ from typing import Literal, Optional
from marimo._output.rich_help import mddoc
from marimo._runtime.context import ContextNotInitializedError, get_context
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._utils.assert_never import assert_never
RunMode = Literal["run", "edit", "script", "test"]
diff --git a/marimo/_runtime/packages/package_manager.py b/marimo/_runtime/packages/package_manager.py
index 2c46ae68ee..5a075867be 100644
--- a/marimo/_runtime/packages/package_manager.py
+++ b/marimo/_runtime/packages/package_manager.py
@@ -15,7 +15,7 @@ from marimo._messaging.notification_utils import broadcast_notification
from marimo._runtime.packages.utils import append_version
if TYPE_CHECKING:
- from marimo._server.models.packages import DependencyTreeNode
+ from marimo._utils.uv_tree import DependencyTreeNode
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_runtime/packages/pypi_package_manager.py b/marimo/_runtime/packages/pypi_package_manager.py
index 14645f47cf..0f015919bb 100644
--- a/marimo/_runtime/packages/pypi_package_manager.py
+++ b/marimo/_runtime/packages/pypi_package_manager.py
@@ -20,10 +20,9 @@ from marimo._runtime.packages.package_manager import (
PackageDescription,
)
from marimo._runtime.packages.utils import split_packages
-from marimo._server.models.packages import DependencyTreeNode
from marimo._utils.platform import is_pyodide
from marimo._utils.uv import find_uv_bin
-from marimo._utils.uv_tree import parse_uv_tree
+from marimo._utils.uv_tree import DependencyTreeNode, parse_uv_tree
PY_EXE = sys.executable
diff --git a/marimo/_runtime/runner/hooks_post_execution.py b/marimo/_runtime/runner/hooks_post_execution.py
index 8b8a12491d..bb52d8620f 100644
--- a/marimo/_runtime/runner/hooks_post_execution.py
+++ b/marimo/_runtime/runner/hooks_post_execution.py
@@ -37,7 +37,7 @@ from marimo._runtime.context.types import get_context, get_global_context
from marimo._runtime.control_flow import MarimoInterrupt, MarimoStopError
from marimo._runtime.runner import cell_runner
from marimo._runtime.side_effect import SideEffect
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._sql.engines.duckdb import (
INTERNAL_DUCKDB_ENGINE,
DuckDBEngine,
diff --git a/marimo/_runtime/runtime.py b/marimo/_runtime/runtime.py
index acef1e75de..8151b8b9ba 100644
--- a/marimo/_runtime/runtime.py
+++ b/marimo/_runtime/runtime.py
@@ -186,8 +186,8 @@ from marimo._secrets.load_dotenv import (
load_dotenv_with_fallback,
)
from marimo._secrets.secrets import get_secret_keys
-from marimo._server.model import SessionMode
-from marimo._server.types import QueueType
+from marimo._session.model import SessionMode
+from marimo._session.queue import QueueType
from marimo._sql.engines.duckdb import INTERNAL_DUCKDB_ENGINE, DuckDBEngine
from marimo._sql.engines.types import (
EngineCatalog,
diff --git a/marimo/_runtime/utils/set_ui_element_request_manager.py b/marimo/_runtime/utils/set_ui_element_request_manager.py
index d60c8b1083..974ff70894 100644
--- a/marimo/_runtime/utils/set_ui_element_request_manager.py
+++ b/marimo/_runtime/utils/set_ui_element_request_manager.py
@@ -4,7 +4,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Any
from marimo._runtime.commands import UpdateUIElementCommand
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
from marimo._types.ids import UIElementId
if TYPE_CHECKING:
diff --git a/marimo/_runtime/virtual_file.py b/marimo/_runtime/virtual_file.py
index 0a03dbc53c..26ae0f15f3 100644
--- a/marimo/_runtime/virtual_file.py
+++ b/marimo/_runtime/virtual_file.py
@@ -14,8 +14,8 @@ from marimo import _loggers
from marimo._messaging.mimetypes import KnownMimeType
from marimo._runtime.cell_lifecycle_item import CellLifecycleItem
from marimo._runtime.context import ContextNotInitializedError
-from marimo._server.api.status import HTTPException, HTTPStatus
from marimo._utils.data_uri import build_data_url
+from marimo._utils.http import HTTPException, HTTPStatus
from marimo._utils.platform import is_pyodide
if TYPE_CHECKING:
diff --git a/marimo/_runtime/win32_interrupt_handler.py b/marimo/_runtime/win32_interrupt_handler.py
index 45cb9d47f9..af12dc0ffe 100644
--- a/marimo/_runtime/win32_interrupt_handler.py
+++ b/marimo/_runtime/win32_interrupt_handler.py
@@ -8,7 +8,7 @@ from _thread import interrupt_main
from typing import TYPE_CHECKING
if TYPE_CHECKING:
- from marimo._server.types import QueueType
+ from marimo._session.queue import QueueType
class Win32InterruptHandler(threading.Thread):
diff --git a/marimo/_secrets/secrets.py b/marimo/_secrets/secrets.py
index aea2dda5e9..baaaadeb88 100644
--- a/marimo/_secrets/secrets.py
+++ b/marimo/_secrets/secrets.py
@@ -1,6 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
+from typing import TYPE_CHECKING
+
from marimo import _loggers
from marimo._config.config import MarimoConfig
from marimo._secrets.env_provider import (
@@ -8,10 +10,12 @@ from marimo._secrets.env_provider import (
EnvSecretsProvider,
)
from marimo._secrets.models import SecretKeysWithProvider, SecretProvider
-from marimo._server.models.secrets import CreateSecretRequest
LOGGER = _loggers.marimo_logger()
+if TYPE_CHECKING:
+ from marimo._server.models.secrets import CreateSecretRequest
+
def _get_providers(
config: MarimoConfig, original_environ: dict[str, str]
diff --git a/marimo/_server/ai/config.py b/marimo/_server/ai/config.py
index 5297992739..72e2497f32 100644
--- a/marimo/_server/ai/config.py
+++ b/marimo/_server/ai/config.py
@@ -21,7 +21,7 @@ from marimo._server.ai.constants import DEFAULT_MAX_TOKENS, DEFAULT_MODEL
from marimo._server.ai.ids import AiModelId
from marimo._server.ai.tools.tool_manager import get_tool_manager
from marimo._server.ai.tools.types import ToolDefinition
-from marimo._server.api.status import HTTPStatus
+from marimo._utils.http import HTTPStatus
@dataclass
diff --git a/marimo/_server/ai/providers.py b/marimo/_server/ai/providers.py
index c9a3b003e3..5ebe027256 100644
--- a/marimo/_server/ai/providers.py
+++ b/marimo/_server/ai/providers.py
@@ -39,8 +39,8 @@ from marimo._server.ai.config import AnyProviderConfig
from marimo._server.ai.ids import AiModelId
from marimo._server.ai.tools.tool_manager import get_tool_manager
from marimo._server.ai.tools.types import ToolDefinition
-from marimo._server.api.status import HTTPStatus
from marimo._server.models.completion import UIMessage as ServerUIMessage
+from marimo._utils.http import HTTPStatus
TIMEOUT = 30
# Long-thinking models can take a long time to complete, so we set a longer timeout
diff --git a/marimo/_server/api/dependency_tree.py b/marimo/_server/api/dependency_tree.py
index 1dab2252e0..b0c2e2d641 100644
--- a/marimo/_server/api/dependency_tree.py
+++ b/marimo/_server/api/dependency_tree.py
@@ -1,7 +1,7 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from marimo._server.models.packages import DependencyTreeNode
+from marimo._utils.uv_tree import DependencyTreeNode
def parse_name_version(content: str) -> tuple[str, str | None]:
diff --git a/marimo/_server/api/deps.py b/marimo/_server/api/deps.py
index 307e7921e4..af66c3cba2 100644
--- a/marimo/_server/api/deps.py
+++ b/marimo/_server/api/deps.py
@@ -5,9 +5,9 @@ from typing import TYPE_CHECKING, Any, Optional, Union, cast
from marimo import _loggers as loggers
from marimo._config.manager import MarimoConfigManager, ScriptConfigManager
-from marimo._server.model import SessionMode
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
from marimo._server.tokens import SkewProtectionToken
+from marimo._session.model import SessionMode
from marimo._types.ids import SessionId
if TYPE_CHECKING:
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
from starlette.websockets import WebSocket
from uvicorn import Server
- from marimo._server.sessions import Session
+ from marimo._session import Session
LOGGER = loggers.marimo_logger()
diff --git a/marimo/_server/api/endpoints/ai.py b/marimo/_server/api/endpoints/ai.py
index 0bd0db57ff..9d4409fbca 100644
--- a/marimo/_server/api/endpoints/ai.py
+++ b/marimo/_server/api/endpoints/ai.py
@@ -40,7 +40,6 @@ from marimo._server.ai.providers import (
)
from marimo._server.ai.tools.tool_manager import get_tool_manager
from marimo._server.api.deps import AppState
-from marimo._server.api.status import HTTPStatus
from marimo._server.api.utils import parse_request
from marimo._server.models.completion import (
AiCompletionRequest,
@@ -55,6 +54,7 @@ from marimo._server.models.models import (
)
from marimo._server.responses import StructResponse
from marimo._server.router import APIRouter
+from marimo._utils.http import HTTPStatus
if TYPE_CHECKING:
from collections.abc import AsyncGenerator
diff --git a/marimo/_server/api/endpoints/config.py b/marimo/_server/api/endpoints/config.py
index 715acacf40..17eebcf35d 100644
--- a/marimo/_server/api/endpoints/config.py
+++ b/marimo/_server/api/endpoints/config.py
@@ -22,7 +22,7 @@ from marimo._server.models.models import (
UpdateUserConfigRequest,
)
from marimo._server.router import APIRouter
-from marimo._server.sessions import send_message_to_consumer
+from marimo._session import send_message_to_consumer
from marimo._types.ids import ConsumerId
if TYPE_CHECKING:
diff --git a/marimo/_server/api/endpoints/export.py b/marimo/_server/api/endpoints/export.py
index a2dea62029..faede0e381 100644
--- a/marimo/_server/api/endpoints/export.py
+++ b/marimo/_server/api/endpoints/export.py
@@ -14,11 +14,9 @@ from marimo._convert.script import convert_from_ir_to_script
from marimo._dependencies.dependencies import DependencyManager
from marimo._messaging.msgspec_encoder import asdict
from marimo._server.api.deps import AppState
-from marimo._server.api.status import HTTPStatus
from marimo._server.api.utils import parse_request
from marimo._server.export.exporter import AutoExporter, Exporter
from marimo._server.export.utils import get_download_filename
-from marimo._server.model import SessionMode
from marimo._server.models.export import (
ExportAsHTMLRequest,
ExportAsMarkdownRequest,
@@ -26,6 +24,8 @@ from marimo._server.models.export import (
)
from marimo._server.models.models import SuccessResponse
from marimo._server.router import APIRouter
+from marimo._session.model import SessionMode
+from marimo._utils.http import HTTPStatus
if TYPE_CHECKING:
from starlette.requests import Request
diff --git a/marimo/_server/api/endpoints/files.py b/marimo/_server/api/endpoints/files.py
index 17bdc6b98d..87bf371a4e 100644
--- a/marimo/_server/api/endpoints/files.py
+++ b/marimo/_server/api/endpoints/files.py
@@ -10,7 +10,6 @@ from starlette.responses import PlainTextResponse
from marimo import _loggers
from marimo._runtime.commands import RenameNotebookCommand
from marimo._server.api.deps import AppState
-from marimo._server.api.status import HTTPStatus
from marimo._server.api.utils import parse_request
from marimo._server.models.models import (
BaseResponse,
@@ -24,6 +23,7 @@ from marimo._server.models.models import (
from marimo._server.router import APIRouter
from marimo._types.ids import ConsumerId
from marimo._utils.async_path import abspath
+from marimo._utils.http import HTTPStatus
if TYPE_CHECKING:
from starlette.requests import Request
diff --git a/marimo/_server/api/endpoints/home.py b/marimo/_server/api/endpoints/home.py
index 8dd04e08d0..72c95f839e 100644
--- a/marimo/_server/api/endpoints/home.py
+++ b/marimo/_server/api/endpoints/home.py
@@ -17,7 +17,6 @@ from marimo._server.file_router import (
LazyListOfFilesAppFileRouter,
count_files,
)
-from marimo._server.model import ConnectionState
from marimo._server.models.home import (
MarimoFile,
OpenTutorialRequest,
@@ -28,6 +27,7 @@ from marimo._server.models.home import (
WorkspaceFilesResponse,
)
from marimo._server.router import APIRouter
+from marimo._session.model import ConnectionState
from marimo._tutorials import create_temp_tutorial_file # type: ignore
from marimo._utils.paths import pretty_path
diff --git a/marimo/_server/api/endpoints/terminal.py b/marimo/_server/api/endpoints/terminal.py
index 7575fd2739..23a7569eaf 100644
--- a/marimo/_server/api/endpoints/terminal.py
+++ b/marimo/_server/api/endpoints/terminal.py
@@ -15,8 +15,8 @@ from starlette.websockets import WebSocket, WebSocketDisconnect, WebSocketState
from marimo import _loggers
from marimo._server.api.deps import AppState
-from marimo._server.model import SessionMode
from marimo._server.router import APIRouter
+from marimo._session.model import SessionMode
if TYPE_CHECKING:
from collections.abc import Iterable
diff --git a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
index fc4c216612..d0ea967650 100644
--- a/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
+++ b/marimo/_server/api/endpoints/ws/ws_kernel_ready.py
@@ -13,13 +13,14 @@ from marimo._messaging.notification import (
KernelReadyNotification,
)
from marimo._plugins.core.web_component import JSONType
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
from marimo._server.file_router import MarimoFileKey
from marimo._server.rtc.doc import LoroDocManager
- from marimo._server.sessions import Session, SessionManager
+ from marimo._server.session_manager import SessionManager
+ from marimo._session import Session
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/api/endpoints/ws/ws_session_connector.py b/marimo/_server/api/endpoints/ws/ws_session_connector.py
index 1de5ad2b80..e74f1dc7da 100644
--- a/marimo/_server/api/endpoints/ws/ws_session_connector.py
+++ b/marimo/_server/api/endpoints/ws/ws_session_connector.py
@@ -11,7 +11,8 @@ if TYPE_CHECKING:
ConnectionParams,
)
from marimo._server.api.endpoints.ws_endpoint import WebSocketHandler
- from marimo._server.sessions import Session, SessionManager
+ from marimo._server.session_manager import SessionManager
+ from marimo._session import Session
from starlette.websockets import WebSocketDisconnect
@@ -19,8 +20,8 @@ from marimo import _loggers
from marimo._messaging.types import NoopStream
from marimo._runtime.params import QueryParams
from marimo._server.codes import WebSocketCodes
-from marimo._server.model import ConnectionState, SessionMode
from marimo._server.models.models import InstantiateNotebookRequest
+from marimo._session.model import ConnectionState, SessionMode
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/api/endpoints/ws_endpoint.py b/marimo/_server/api/endpoints/ws_endpoint.py
index 8e311569fe..8540e9ac9d 100644
--- a/marimo/_server/api/endpoints/ws_endpoint.py
+++ b/marimo/_server/api/endpoints/ws_endpoint.py
@@ -38,15 +38,16 @@ from marimo._server.api.endpoints.ws.ws_session_connector import (
SessionConnector,
)
from marimo._server.codes import WebSocketCodes
-from marimo._server.consumer import SessionConsumer
-from marimo._server.model import (
+from marimo._server.router import APIRouter
+from marimo._server.rtc.doc import LoroDocManager
+from marimo._server.session_manager import SessionManager
+from marimo._session import Session
+from marimo._session.consumer import SessionConsumer
+from marimo._session.events import SessionEventBus
+from marimo._session.model import (
ConnectionState,
SessionMode,
)
-from marimo._server.router import APIRouter
-from marimo._server.rtc.doc import LoroDocManager
-from marimo._server.sessions import Session, SessionManager
-from marimo._server.sessions.events import SessionEventBus
from marimo._types.ids import CellId_t, ConsumerId
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/api/interrupt.py b/marimo/_server/api/interrupt.py
index 4d3ab5c9fc..3e7070d1df 100644
--- a/marimo/_server/api/interrupt.py
+++ b/marimo/_server/api/interrupt.py
@@ -8,7 +8,7 @@ import time
from typing import Callable
from marimo._config.settings import GLOBAL_SETTINGS
-from marimo._server.utils import (
+from marimo._utils.print import (
TAB,
print_,
)
diff --git a/marimo/_server/api/lifespans.py b/marimo/_server/api/lifespans.py
index cc48bcb307..711e50fdc0 100644
--- a/marimo/_server/api/lifespans.py
+++ b/marimo/_server/api/lifespans.py
@@ -14,7 +14,6 @@ from marimo._server.api.interrupt import InterruptHandler
from marimo._server.api.utils import open_url_in_browser
from marimo._server.file_router import AppFileRouter
from marimo._server.lsp import any_lsp_server_running
-from marimo._server.model import SessionMode
from marimo._server.print import (
print_experimental_features,
print_mcp_client,
@@ -22,10 +21,11 @@ from marimo._server.print import (
print_shutdown,
print_startup,
)
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
from marimo._server.tokens import AuthToken
from marimo._server.utils import initialize_mimetypes
from marimo._server.uvicorn_utils import close_uvicorn
+from marimo._session.model import SessionMode
if TYPE_CHECKING:
from collections.abc import AsyncIterator
diff --git a/marimo/_server/api/middleware.py b/marimo/_server/api/middleware.py
index 79f585437b..a5c5e9f9b8 100644
--- a/marimo/_server/api/middleware.py
+++ b/marimo/_server/api/middleware.py
@@ -40,10 +40,10 @@ from marimo._dependencies.dependencies import DependencyManager
from marimo._server.api.auth import validate_auth
from marimo._server.api.deps import AppState, AppStateBase
from marimo._server.codes import WebSocketCodes
-from marimo._server.model import SessionMode
-from marimo._server.utils import print_tabbed
from marimo._server.uvicorn_utils import close_uvicorn
+from marimo._session.model import SessionMode
from marimo._tracer import server_tracer
+from marimo._utils.print import print_tabbed
if TYPE_CHECKING:
from starlette.datastructures import State
diff --git a/marimo/_server/asgi.py b/marimo/_server/asgi.py
index edd59fa524..5271536d36 100644
--- a/marimo/_server/asgi.py
+++ b/marimo/_server/asgi.py
@@ -391,11 +391,11 @@ def create_asgi_app(
from marimo._server.file_router import AppFileRouter
from marimo._server.lsp import NoopLspServer
from marimo._server.main import create_starlette_app
- from marimo._server.model import SessionMode
from marimo._server.registry import LIFESPAN_REGISTRY
- from marimo._server.sessions import SessionManager
+ from marimo._server.session_manager import SessionManager
from marimo._server.tokens import AuthToken
from marimo._server.utils import initialize_asyncio
+ from marimo._session.model import SessionMode
from marimo._utils.lifespans import Lifespans
from marimo._utils.marimo_path import MarimoPath
diff --git a/marimo/_server/errors.py b/marimo/_server/errors.py
index 98476ff666..9d8e31cc70 100644
--- a/marimo/_server/errors.py
+++ b/marimo/_server/errors.py
@@ -11,13 +11,13 @@ from marimo import _loggers
from marimo._messaging.notification import MissingPackageAlertNotification
from marimo._runtime.packages.utils import is_python_isolated
from marimo._server.api.deps import AppState
-from marimo._server.api.status import (
+from marimo._session import send_message_to_consumer
+from marimo._session.model import SessionMode
+from marimo._types.ids import ConsumerId
+from marimo._utils.http import (
HTTPException as MarimoHTTPException,
is_client_error,
)
-from marimo._server.model import SessionMode
-from marimo._server.sessions import send_message_to_consumer
-from marimo._types.ids import ConsumerId
if TYPE_CHECKING:
from starlette.requests import Request
diff --git a/marimo/_server/export/__init__.py b/marimo/_server/export/__init__.py
index b40f73f57b..79ecc4f8a8 100644
--- a/marimo/_server/export/__init__.py
+++ b/marimo/_server/export/__init__.py
@@ -30,18 +30,18 @@ from marimo._schemas.serialization import NotebookSerialization
from marimo._server.export.exporter import Exporter
from marimo._server.export.utils import get_download_filename
from marimo._server.file_router import AppFileRouter
-from marimo._server.model import ConnectionState, SessionMode
from marimo._server.models.export import ExportAsHTMLRequest
from marimo._server.models.models import InstantiateNotebookRequest
-from marimo._server.notebook import AppFileManager
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import ConsumerId
from marimo._utils.marimo_path import MarimoPath
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from marimo._server.session.session_view import SessionView
- from marimo._server.sessions.types import Session
+ from marimo._session.state.session_view import SessionView
+ from marimo._session.types import Session
@dataclass
@@ -236,9 +236,9 @@ async def run_app_until_completion(
cli_args: SerializedCLIArgs,
argv: list[str] | None,
) -> tuple[SessionView, bool]:
- from marimo._server.consumer import SessionConsumer
- from marimo._server.sessions.events import SessionEventBus
- from marimo._server.sessions.session import SessionImpl
+ from marimo._session.consumer import SessionConsumer
+ from marimo._session.events import SessionEventBus
+ from marimo._session.session import SessionImpl
instantiated_event = asyncio.Event()
diff --git a/marimo/_server/export/exporter.py b/marimo/_server/export/exporter.py
index 875e733c92..3fbcd422ef 100644
--- a/marimo/_server/export/exporter.py
+++ b/marimo/_server/export/exporter.py
@@ -42,16 +42,16 @@ from marimo._server.export.utils import (
get_filename,
)
from marimo._server.models.export import ExportAsHTMLRequest
-from marimo._server.session.serialize import (
- serialize_notebook,
- serialize_session_view,
-)
-from marimo._server.session.session_view import SessionView
from marimo._server.templates.templates import (
static_notebook_template,
wasm_notebook_template,
)
from marimo._server.tokens import SkewProtectionToken
+from marimo._session.state.serialize import (
+ serialize_notebook,
+ serialize_session_view,
+)
+from marimo._session.state.session_view import SessionView
from marimo._utils import async_path
from marimo._utils.code import hash_code
from marimo._utils.data_uri import build_data_url
diff --git a/marimo/_server/file_router.py b/marimo/_server/file_router.py
index fd5c312ef7..e743db1658 100644
--- a/marimo/_server/file_router.py
+++ b/marimo/_server/file_router.py
@@ -10,11 +10,11 @@ from typing import TYPE_CHECKING, Optional
from marimo import _loggers
from marimo._config.config import ExportType, SqlOutputType, WidthType
-from marimo._server.api.status import HTTPException, HTTPStatus
from marimo._server.files.os_file_system import natural_sort_file
from marimo._server.models.files import FileInfo
from marimo._server.models.home import MarimoFile
-from marimo._server.notebook import AppFileManager
+from marimo._session.notebook import AppFileManager
+from marimo._utils.http import HTTPException, HTTPStatus
from marimo._utils.marimo_path import MarimoPath
if TYPE_CHECKING:
diff --git a/marimo/_server/main.py b/marimo/_server/main.py
index 5ff9adbe36..82d6613d11 100644
--- a/marimo/_server/main.py
+++ b/marimo/_server/main.py
@@ -24,12 +24,12 @@ from marimo._server.api.middleware import (
TimeoutMiddleware,
)
from marimo._server.api.router import build_routes
-from marimo._server.api.status import (
- HTTPException as MarimoHTTPException,
-)
from marimo._server.errors import handle_error
from marimo._server.lsp import LspServer
from marimo._server.registry import MIDDLEWARE_REGISTRY
+from marimo._utils.http import (
+ HTTPException as MarimoHTTPException,
+)
if TYPE_CHECKING:
from collections.abc import Iterator
diff --git a/marimo/_server/models/packages.py b/marimo/_server/models/packages.py
index 6f5ad2de07..8e783db7e1 100644
--- a/marimo/_server/models/packages.py
+++ b/marimo/_server/models/packages.py
@@ -6,6 +6,7 @@ from typing import Optional
import msgspec
from marimo._runtime.packages.package_manager import PackageDescription
+from marimo._utils.uv_tree import DependencyTreeNode
class AddPackageRequest(msgspec.Struct, rename="camel"):
@@ -36,14 +37,6 @@ class ListPackagesResponse(msgspec.Struct, rename="camel"):
packages: list[PackageDescription]
-class DependencyTreeNode(msgspec.Struct, rename="camel"):
- name: str
- version: Optional[str]
- # List of {"kind": "extra"|"group", "value": str}
- tags: list[dict[str, str]]
- dependencies: list[DependencyTreeNode]
-
-
class DependencyTreeResponse(msgspec.Struct, rename="camel"):
tree: Optional[DependencyTreeNode]
diff --git a/marimo/_server/print.py b/marimo/_server/print.py
index f0888517a8..1f5ef6da7d 100644
--- a/marimo/_server/print.py
+++ b/marimo/_server/print.py
@@ -7,7 +7,7 @@ from typing import Optional
from marimo._cli.print import bold, green, muted
from marimo._config.config import MarimoConfig, MCPConfig
-from marimo._server.utils import print_, print_tabbed
+from marimo._utils.print import print_, print_tabbed
UTF8_SUPPORTED = False
diff --git a/marimo/_server/sessions/listeners.py b/marimo/_server/session/listeners.py
similarity index 93%
rename from marimo/_server/sessions/listeners.py
rename to marimo/_server/session/listeners.py
index 187537e048..5239cffad2 100644
--- a/marimo/_server/sessions/listeners.py
+++ b/marimo/_server/session/listeners.py
@@ -8,12 +8,12 @@ tracking recent files, managing caches, etc.
from __future__ import annotations
from marimo._server.recents import RecentFilesManager
-from marimo._server.sessions.events import (
+from marimo._session.events import (
SessionEventBus,
SessionEventListener,
)
-from marimo._server.sessions.extensions.types import SessionExtension
-from marimo._server.sessions.session import Session
+from marimo._session.extensions.types import SessionExtension
+from marimo._session.session import Session
from marimo._types.ids import SessionId
diff --git a/marimo/_server/sessions/session_manager.py b/marimo/_server/session_manager.py
similarity index 93%
rename from marimo/_server/sessions/session_manager.py
rename to marimo/_server/session_manager.py
index 1454f59a6c..6f378e6395 100644
--- a/marimo/_server/sessions/session_manager.py
+++ b/marimo/_server/session_manager.py
@@ -18,34 +18,34 @@ from marimo._runtime.commands import (
SerializedCLIArgs,
SerializedQueryParams,
)
-from marimo._server.consumer import SessionConsumer
from marimo._server.file_router import AppFileRouter, MarimoFileKey
from marimo._server.lsp import LspServer
-from marimo._server.model import ConnectionState, SessionMode
from marimo._server.recents import RecentFilesManager
-from marimo._server.sessions.events import SessionEventBus
-from marimo._server.sessions.extensions.types import SessionExtension
-from marimo._server.sessions.file_change_handler import (
+from marimo._server.session.listeners import RecentsTrackerListener
+from marimo._server.token_manager import TokenManager
+from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.consumer import SessionConsumer
+from marimo._session.events import SessionEventBus
+from marimo._session.extensions.types import SessionExtension
+from marimo._session.file_change_handler import (
FileChangeCoordinator,
create_reload_strategy,
)
-from marimo._server.sessions.file_watcher_integration import (
+from marimo._session.file_watcher_integration import (
SessionFileWatcherExtension,
)
-from marimo._server.sessions.listeners import RecentsTrackerListener
-from marimo._server.sessions.resume_strategies import create_resume_strategy
-from marimo._server.sessions.session import Session, SessionImpl
-from marimo._server.sessions.session_repository import SessionRepository
-from marimo._server.sessions.token_manager import TokenManager
-from marimo._server.sessions.types import KernelState
-from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.resume_strategies import create_resume_strategy
+from marimo._session.session import Session, SessionImpl
+from marimo._session.session_repository import SessionRepository
+from marimo._session.types import KernelState
from marimo._types.ids import ConsumerId, SessionId
from marimo._utils.file_watcher import FileWatcherManager
if TYPE_CHECKING:
from collections.abc import Awaitable, Coroutine, Mapping
- from marimo._server.notebook import AppFileManager
+ from marimo._session.notebook import AppFileManager
LOGGER = _loggers.marimo_logger()
@@ -227,7 +227,7 @@ class SessionManager:
Returns:
tuple[bool, Optional[str]]: (success, error_message)
"""
- from marimo._server.api.status import HTTPException
+ from marimo._utils.http import HTTPException
session = self.get_session(session_id)
if not session:
diff --git a/marimo/_server/start.py b/marimo/_server/start.py
index 6c406247e3..ee6b68d699 100644
--- a/marimo/_server/start.py
+++ b/marimo/_server/start.py
@@ -19,9 +19,8 @@ from marimo._runtime.commands import SerializedCLIArgs
from marimo._server.file_router import AppFileRouter
from marimo._server.lsp import CompositeLspServer, NoopLspServer
from marimo._server.main import create_starlette_app
-from marimo._server.model import SessionMode
from marimo._server.registry import LIFESPAN_REGISTRY
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
from marimo._server.tokens import AuthToken
from marimo._server.utils import (
find_free_port,
@@ -29,6 +28,7 @@ from marimo._server.utils import (
initialize_fd_limit,
)
from marimo._server.uvicorn_utils import initialize_signals
+from marimo._session.model import SessionMode
from marimo._tracer import LOGGER
from marimo._utils.lifespans import Lifespans
from marimo._utils.paths import marimo_package_path
diff --git a/marimo/_server/templates/api.py b/marimo/_server/templates/api.py
index e5e510470a..893568b370 100644
--- a/marimo/_server/templates/api.py
+++ b/marimo/_server/templates/api.py
@@ -15,13 +15,13 @@ from marimo._config.config import MarimoConfig, PartialMarimoConfig
from marimo._convert.converters import MarimoConvert
from marimo._schemas.notebook import NotebookV1
from marimo._schemas.session import NotebookSessionV1
-from marimo._server.model import SessionMode
from marimo._server.templates.templates import (
_custom_css_block,
notebook_page_template,
static_notebook_template,
)
from marimo._server.tokens import SkewProtectionToken
+from marimo._session.model import SessionMode
from marimo._utils.code import hash_code
diff --git a/marimo/_server/templates/templates.py b/marimo/_server/templates/templates.py
index 4388024885..dec4a4cd6f 100644
--- a/marimo/_server/templates/templates.py
+++ b/marimo/_server/templates/templates.py
@@ -15,9 +15,9 @@ from marimo._output.utils import uri_encode_component
from marimo._schemas.notebook import NotebookV1
from marimo._schemas.session import NotebookSessionV1
from marimo._server.api.utils import parse_title
-from marimo._server.model import SessionMode
-from marimo._server.notebook import read_css_file, read_html_head_file
from marimo._server.tokens import SkewProtectionToken
+from marimo._session.model import SessionMode
+from marimo._session.notebook import read_css_file, read_html_head_file
from marimo._utils.versions import is_editable
from marimo._version import __version__
diff --git a/marimo/_server/sessions/token_manager.py b/marimo/_server/token_manager.py
similarity index 97%
rename from marimo/_server/sessions/token_manager.py
rename to marimo/_server/token_manager.py
index 1ee9001d01..5c148849ef 100644
--- a/marimo/_server/sessions/token_manager.py
+++ b/marimo/_server/token_manager.py
@@ -9,8 +9,8 @@ from __future__ import annotations
from typing import Optional
-from marimo._server.model import SessionMode
from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.model import SessionMode
class TokenManager:
diff --git a/marimo/_server/utils.py b/marimo/_server/utils.py
index 939c8158f7..e58f060e82 100644
--- a/marimo/_server/utils.py
+++ b/marimo/_server/utils.py
@@ -9,31 +9,15 @@ import sys
from typing import TYPE_CHECKING, Any, TypeVar
from marimo import _loggers
-from marimo._utils.marimo_path import MarimoPath
if TYPE_CHECKING:
from collections.abc import Coroutine
from typing import Optional
-# use spaces instead of a tab to play well with carriage returns;
-# \r\t doesn't appear to overwrite characters at the start of a line,
-# but \r{TAB} does ...
-TAB = " "
LOGGER = _loggers.marimo_logger()
-def print_tabbed(string: str, n_tabs: int = 1) -> None:
- print_(f"{TAB * n_tabs}{string}")
-
-
-def canonicalize_filename(filename: str) -> str:
- # If its not a valid Python or Markdown file, then add .py
- if not MarimoPath.is_valid_path(filename):
- filename += ".py"
- return os.path.expanduser(filename)
-
-
_DEFAULT_BACKLOG = 128
@@ -279,12 +263,3 @@ def asyncio_run(coro: Coroutine[Any, Any, T], **kwargs: dict[Any, Any]) -> T:
"""
initialize_asyncio()
return asyncio.run(coro, **kwargs) # type: ignore[arg-type]
-
-
-def print_(*args: Any, **kwargs: Any) -> None:
- try:
- import click
-
- click.echo(*args, **kwargs)
- except ImportError:
- print(*args, **kwargs) # noqa: T201
diff --git a/marimo/_server/sessions/__init__.py b/marimo/_session/__init__.py
similarity index 77%
rename from marimo/_server/sessions/__init__.py
rename to marimo/_session/__init__.py
index 5662a9ec2d..f09ade2372 100644
--- a/marimo/_server/sessions/__init__.py
+++ b/marimo/_session/__init__.py
@@ -13,17 +13,15 @@ All public APIs are re-exported from this module for backward compatibility.
from __future__ import annotations
-from marimo._server.sessions.session_manager import SessionManager
-from marimo._server.sessions.types import (
+from marimo._session.types import (
KernelManager,
QueueManager,
Session,
)
-from marimo._server.sessions.utils import send_message_to_consumer
+from marimo._session.utils import send_message_to_consumer
__all__ = [
"Session",
- "SessionManager",
"KernelManager",
"QueueManager",
"send_message_to_consumer",
diff --git a/marimo/_server/consumer.py b/marimo/_session/consumer.py
similarity index 85%
rename from marimo/_server/consumer.py
rename to marimo/_session/consumer.py
index c3834acde2..02d103059a 100644
--- a/marimo/_server/consumer.py
+++ b/marimo/_session/consumer.py
@@ -4,12 +4,12 @@ from __future__ import annotations
from abc import ABC, abstractmethod
from typing import TYPE_CHECKING
-from marimo._server.sessions.extensions.types import SessionExtension
+from marimo._session.extensions.types import SessionExtension
from marimo._types.ids import ConsumerId
if TYPE_CHECKING:
from marimo._messaging.types import KernelMessage
- from marimo._server.model import ConnectionState
+ from marimo._session.model import ConnectionState
class SessionConsumer(ABC, SessionExtension):
diff --git a/marimo/_server/sessions/events.py b/marimo/_session/events.py
similarity index 99%
rename from marimo/_server/sessions/events.py
rename to marimo/_session/events.py
index b65a3e697c..51f10961ba 100644
--- a/marimo/_server/sessions/events.py
+++ b/marimo/_session/events.py
@@ -14,7 +14,7 @@ from marimo._types.ids import ConsumerId, SessionId
if TYPE_CHECKING:
from marimo._runtime import commands
- from marimo._server.sessions.session import Session
+ from marimo._session.session import Session
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/sessions/extensions/__init__.py b/marimo/_session/extensions/__init__.py
similarity index 100%
rename from marimo/_server/sessions/extensions/__init__.py
rename to marimo/_session/extensions/__init__.py
diff --git a/marimo/_server/sessions/extensions/extensions.py b/marimo/_session/extensions/extensions.py
similarity index 96%
rename from marimo/_server/sessions/extensions/extensions.py
rename to marimo/_session/extensions/extensions.py
index 8a59de8b09..d3d6da8a42 100644
--- a/marimo/_server/sessions/extensions/extensions.py
+++ b/marimo/_session/extensions/extensions.py
@@ -14,31 +14,31 @@ from marimo import _loggers
from marimo._cli.print import red
from marimo._messaging.types import KernelMessage
from marimo._runtime import commands
-from marimo._server.session.serialize import (
+from marimo._session.events import SessionEventListener
+from marimo._session.extensions.types import SessionExtension
+from marimo._session.state.serialize import (
SessionCacheKey,
SessionCacheManager,
)
-from marimo._server.sessions.events import SessionEventListener
-from marimo._server.sessions.extensions.types import SessionExtension
-from marimo._server.sessions.types import (
+from marimo._session.types import (
KernelManager,
KernelState,
QueueManager,
)
-from marimo._server.utils import print_, print_tabbed
from marimo._utils.distributor import (
ConnectionDistributor,
Distributor,
QueueDistributor,
)
+from marimo._utils.print import print_, print_tabbed
if TYPE_CHECKING:
from logging import Logger
- from marimo._server.sessions.events import (
+ from marimo._session.events import (
SessionEventBus,
)
- from marimo._server.sessions.types import Session
+ from marimo._session.types import Session
from marimo._types.ids import ConsumerId, SessionId
LOGGER = _loggers.marimo_logger()
@@ -196,7 +196,7 @@ class NotificationListenerExtension(SessionExtension):
kernel_manager: KernelManager,
queue_manager: QueueManager,
) -> Distributor[KernelMessage]:
- from marimo._server.model import SessionMode
+ from marimo._session.model import SessionMode
if kernel_manager.mode == SessionMode.EDIT:
return ConnectionDistributor(kernel_manager.kernel_connection)
diff --git a/marimo/_server/sessions/extensions/types.py b/marimo/_session/extensions/types.py
similarity index 86%
rename from marimo/_server/sessions/extensions/types.py
rename to marimo/_session/extensions/types.py
index fc76165c92..e5834528da 100644
--- a/marimo/_server/sessions/extensions/types.py
+++ b/marimo/_session/extensions/types.py
@@ -4,8 +4,8 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Protocol
if TYPE_CHECKING:
- from marimo._server.sessions.events import SessionEventBus
- from marimo._server.sessions.session import Session
+ from marimo._session.events import SessionEventBus
+ from marimo._session.session import Session
class SessionExtension(Protocol):
diff --git a/marimo/_server/sessions/file_change_handler.py b/marimo/_session/file_change_handler.py
similarity index 98%
rename from marimo/_server/sessions/file_change_handler.py
rename to marimo/_session/file_change_handler.py
index d3f4d3e204..7ad1254c8c 100644
--- a/marimo/_server/sessions/file_change_handler.py
+++ b/marimo/_session/file_change_handler.py
@@ -18,7 +18,7 @@ from marimo._messaging.notification import (
UpdateCellIdsNotification,
)
from marimo._runtime.commands import DeleteCellCommand, SyncGraphCommand
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
from marimo._utils import async_path
@@ -27,7 +27,7 @@ LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
from pathlib import Path
- from marimo._server.sessions.types import Session
+ from marimo._session.types import Session
@dataclass
diff --git a/marimo/_server/sessions/file_watcher_integration.py b/marimo/_session/file_watcher_integration.py
similarity index 95%
rename from marimo/_server/sessions/file_watcher_integration.py
rename to marimo/_session/file_watcher_integration.py
index c4ec527b2d..9bf10e7abe 100644
--- a/marimo/_server/sessions/file_watcher_integration.py
+++ b/marimo/_session/file_watcher_integration.py
@@ -11,12 +11,12 @@ from pathlib import Path
from typing import TYPE_CHECKING, Callable
from marimo import _loggers
-from marimo._server.sessions.events import (
+from marimo._session.events import (
SessionEventBus,
SessionEventListener,
)
-from marimo._server.sessions.extensions.types import SessionExtension
-from marimo._server.sessions.session import Session
+from marimo._session.extensions.types import SessionExtension
+from marimo._session.session import Session
from marimo._utils.file_watcher import FileWatcherManager
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/sessions/managers.py b/marimo/_session/managers.py
similarity index 98%
rename from marimo/_server/sessions/managers.py
rename to marimo/_session/managers.py
index df10528e0e..775fae7ed7 100644
--- a/marimo/_server/sessions/managers.py
+++ b/marimo/_session/managers.py
@@ -26,11 +26,11 @@ from marimo._messaging.types import KernelMessage
from marimo._output.formatters.formatters import register_formatters
from marimo._runtime import commands, runtime
from marimo._runtime.commands import AppMetadata
-from marimo._server.model import SessionMode
-from marimo._server.sessions.types import KernelManager, QueueManager
-from marimo._server.types import ProcessLike
-from marimo._server.utils import print_
+from marimo._session.model import SessionMode
+from marimo._session.queue import ProcessLike
+from marimo._session.types import KernelManager, QueueManager
from marimo._types.ids import CellId_t
+from marimo._utils.print import print_
from marimo._utils.typed_connection import TypedConnection
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/model.py b/marimo/_session/model.py
similarity index 100%
rename from marimo/_server/model.py
rename to marimo/_session/model.py
diff --git a/marimo/_server/notebook/__init__.py b/marimo/_session/notebook/__init__.py
similarity index 67%
rename from marimo/_server/notebook/__init__.py
rename to marimo/_session/notebook/__init__.py
index 39c47c2919..dee33b79c7 100644
--- a/marimo/_server/notebook/__init__.py
+++ b/marimo/_session/notebook/__init__.py
@@ -1,17 +1,22 @@
# Copyright 2026 Marimo. All rights reserved.
"""Notebook file management and storage abstractions."""
-from marimo._server.notebook.file_manager import (
+from __future__ import annotations
+
+from marimo._session.notebook.file_manager import (
AppFileManager,
read_css_file,
read_html_head_file,
)
-from marimo._server.notebook.serializer import (
+from marimo._session.notebook.serializer import (
MarkdownNotebookSerializer,
NotebookSerializer,
PythonNotebookSerializer,
)
-from marimo._server.notebook.storage import FilesystemStorage, StorageInterface
+from marimo._session.notebook.storage import (
+ FilesystemStorage,
+ StorageInterface,
+)
__all__ = [
"AppFileManager",
diff --git a/marimo/_server/notebook/file_manager.py b/marimo/_session/notebook/file_manager.py
similarity index 96%
rename from marimo/_server/notebook/file_manager.py
rename to marimo/_session/notebook/file_manager.py
index 53874cf0ca..0014c3615f 100644
--- a/marimo/_server/notebook/file_manager.py
+++ b/marimo/_session/notebook/file_manager.py
@@ -3,7 +3,7 @@ from __future__ import annotations
import os
from pathlib import Path
-from typing import Any, Optional
+from typing import TYPE_CHECKING, Any, Optional
from marimo import _loggers
from marimo._ast import load
@@ -17,18 +17,30 @@ from marimo._runtime.layout.layout import (
save_layout_config,
)
from marimo._schemas.serialization import Header, NotebookSerializationV1
-from marimo._server.api.status import HTTPException, HTTPStatus
-from marimo._server.models.models import (
- CopyNotebookRequest,
- SaveNotebookRequest,
+from marimo._session.notebook.serializer import get_format_handler
+from marimo._session.notebook.storage import (
+ FilesystemStorage,
+ StorageInterface,
)
-from marimo._server.notebook.serializer import get_format_handler
-from marimo._server.notebook.storage import FilesystemStorage, StorageInterface
-from marimo._server.utils import canonicalize_filename
from marimo._types.ids import CellId_t
+from marimo._utils.http import HTTPException, HTTPStatus
+from marimo._utils.marimo_path import MarimoPath
LOGGER = _loggers.marimo_logger()
+if TYPE_CHECKING:
+ from marimo._server.models.models import (
+ CopyNotebookRequest,
+ SaveNotebookRequest,
+ )
+
+
+def canonicalize_filename(filename: str) -> str:
+ # If its not a valid Python or Markdown file, then add .py
+ if not MarimoPath.is_valid_path(filename):
+ filename += ".py"
+ return os.path.expanduser(filename)
+
class AppFileManager:
"""Manages notebook file operations.
diff --git a/marimo/_server/notebook/serializer.py b/marimo/_session/notebook/serializer.py
similarity index 100%
rename from marimo/_server/notebook/serializer.py
rename to marimo/_session/notebook/serializer.py
diff --git a/marimo/_server/notebook/storage.py b/marimo/_session/notebook/storage.py
similarity index 99%
rename from marimo/_server/notebook/storage.py
rename to marimo/_session/notebook/storage.py
index 87e21e07fc..e4b163bf59 100644
--- a/marimo/_server/notebook/storage.py
+++ b/marimo/_session/notebook/storage.py
@@ -7,7 +7,7 @@ from pathlib import Path
from typing import Optional, Protocol
from marimo import _loggers
-from marimo._server.api.status import HTTPException, HTTPStatus
+from marimo._utils.http import HTTPException, HTTPStatus
LOGGER = _loggers.marimo_logger()
diff --git a/marimo/_server/types.py b/marimo/_session/queue.py
similarity index 100%
rename from marimo/_server/types.py
rename to marimo/_session/queue.py
diff --git a/marimo/_server/sessions/resume_strategies.py b/marimo/_session/resume_strategies.py
similarity index 92%
rename from marimo/_server/sessions/resume_strategies.py
rename to marimo/_session/resume_strategies.py
index afe1b80020..8ce152b9ae 100644
--- a/marimo/_server/sessions/resume_strategies.py
+++ b/marimo/_session/resume_strategies.py
@@ -6,17 +6,19 @@ Provides mode-specific logic for determining whether and how to resume sessions.
from __future__ import annotations
-from typing import Optional, Protocol
+from typing import TYPE_CHECKING, Optional, Protocol
from marimo import _loggers
-from marimo._server.file_router import MarimoFileKey
-from marimo._server.model import ConnectionState, SessionMode
-from marimo._server.sessions.session import Session
-from marimo._server.sessions.session_repository import SessionRepository
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.session import Session
+from marimo._session.session_repository import SessionRepository
from marimo._types.ids import SessionId
LOGGER = _loggers.marimo_logger()
+if TYPE_CHECKING:
+ from marimo._server.file_router import MarimoFileKey
+
class SessionResumeStrategy(Protocol):
"""Protocol for session resume strategies."""
diff --git a/marimo/_server/sessions/room.py b/marimo/_session/room.py
similarity index 95%
rename from marimo/_server/sessions/room.py
rename to marimo/_session/room.py
index fd2b18a2ca..26dfff288a 100644
--- a/marimo/_server/sessions/room.py
+++ b/marimo/_session/room.py
@@ -12,13 +12,13 @@ from typing import TYPE_CHECKING, Optional
from marimo import _loggers
from marimo._messaging.types import KernelMessage
-from marimo._server.model import ConnectionState
+from marimo._session.model import ConnectionState
from marimo._types.ids import ConsumerId
LOGGER = _loggers.marimo_logger()
if TYPE_CHECKING:
- from marimo._server.consumer import SessionConsumer
+ from marimo._session.consumer import SessionConsumer
class Room:
diff --git a/marimo/_server/sessions/session.py b/marimo/_session/session.py
similarity index 95%
rename from marimo/_server/sessions/session.py
rename to marimo/_session/session.py
index 6e2d163268..de94994b6d 100644
--- a/marimo/_server/sessions/session.py
+++ b/marimo/_session/session.py
@@ -25,13 +25,9 @@ from marimo._runtime.commands import (
HTTPRequest,
UpdateUIElementCommand,
)
-from marimo._server.consumer import SessionConsumer
-from marimo._server.model import ConnectionState, SessionMode
-from marimo._server.models.models import InstantiateNotebookRequest
-from marimo._server.notebook import AppFileManager
-from marimo._server.session.session_view import SessionView
-from marimo._server.sessions.events import SessionEventBus
-from marimo._server.sessions.extensions.extensions import (
+from marimo._session.consumer import SessionConsumer
+from marimo._session.events import SessionEventBus
+from marimo._session.extensions.extensions import (
CachingExtension,
HeartbeatExtension,
LoggingExtension,
@@ -40,13 +36,16 @@ from marimo._server.sessions.extensions.extensions import (
ReplayExtension,
SessionViewExtension,
)
-from marimo._server.sessions.extensions.types import SessionExtension
-from marimo._server.sessions.managers import (
+from marimo._session.extensions.types import SessionExtension
+from marimo._session.managers import (
KernelManagerImpl,
QueueManagerImpl,
)
-from marimo._server.sessions.room import Room
-from marimo._server.sessions.types import (
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.notebook import AppFileManager
+from marimo._session.room import Room
+from marimo._session.state.session_view import SessionView
+from marimo._session.types import (
KernelManager,
KernelState,
Session,
@@ -57,6 +56,8 @@ from marimo._utils.repr import format_repr
if TYPE_CHECKING:
from collections.abc import Mapping
+ from marimo._server.models.models import InstantiateNotebookRequest
+
LOGGER = _loggers.marimo_logger()
_DEFAULT_TTL_SECONDS = 120
diff --git a/marimo/_server/sessions/session_repository.py b/marimo/_session/session_repository.py
similarity index 97%
rename from marimo/_server/sessions/session_repository.py
rename to marimo/_session/session_repository.py
index 5e90dbde35..84660073be 100644
--- a/marimo/_server/sessions/session_repository.py
+++ b/marimo/_session/session_repository.py
@@ -6,14 +6,15 @@ from __future__ import annotations
import asyncio
from typing import TYPE_CHECKING, Optional
-from marimo._server.file_router import MarimoFileKey
-from marimo._server.model import ConnectionState
-from marimo._server.sessions.session import Session
+from marimo._session.model import ConnectionState
+from marimo._session.session import Session
from marimo._types.ids import ConsumerId, SessionId
if TYPE_CHECKING:
from collections.abc import Mapping
+ from marimo._server.file_router import MarimoFileKey
+
class SessionRepository:
"""In-memory storage for sessions with thread-safe operations."""
diff --git a/marimo/_server/session/__init__.py b/marimo/_session/state/__init__.py
similarity index 100%
rename from marimo/_server/session/__init__.py
rename to marimo/_session/state/__init__.py
diff --git a/marimo/_server/session/serialize.py b/marimo/_session/state/serialize.py
similarity index 99%
rename from marimo/_server/session/serialize.py
rename to marimo/_session/state/serialize.py
index 269f4a78fe..eed0278168 100644
--- a/marimo/_server/session/serialize.py
+++ b/marimo/_session/state/serialize.py
@@ -37,7 +37,7 @@ from marimo._schemas.session import (
StreamMediaOutput,
StreamOutput,
)
-from marimo._server.session.session_view import SessionView
+from marimo._session.state.session_view import SessionView
from marimo._types.ids import CellId_t
from marimo._utils.async_path import AsyncPath
from marimo._utils.background_task import AsyncBackgroundTask
diff --git a/marimo/_server/session/session_view.py b/marimo/_session/state/session_view.py
similarity index 100%
rename from marimo/_server/session/session_view.py
rename to marimo/_session/state/session_view.py
diff --git a/marimo/_server/sessions/types.py b/marimo/_session/types.py
similarity index 94%
rename from marimo/_server/sessions/types.py
rename to marimo/_session/types.py
index 50843e3b41..6278654317 100644
--- a/marimo/_server/sessions/types.py
+++ b/marimo/_session/types.py
@@ -19,14 +19,14 @@ if TYPE_CHECKING:
from marimo._messaging.notification import NotificationMessage
from marimo._messaging.types import KernelMessage
from marimo._runtime import commands
- from marimo._server.consumer import SessionConsumer
- from marimo._server.model import (
+ from marimo._session.consumer import SessionConsumer
+ from marimo._session.model import (
ConnectionState,
SessionMode,
)
- from marimo._server.notebook.file_manager import AppFileManager
- from marimo._server.session.session_view import SessionView
- from marimo._server.types import ProcessLike, QueueType
+ from marimo._session.notebook.file_manager import AppFileManager
+ from marimo._session.queue import ProcessLike, QueueType
+ from marimo._session.state.session_view import SessionView
from marimo._types.ids import ConsumerId
from marimo._utils.typed_connection import TypedConnection
diff --git a/marimo/_server/sessions/utils.py b/marimo/_session/utils.py
similarity index 88%
rename from marimo/_server/sessions/utils.py
rename to marimo/_session/utils.py
index ef36fd4307..7467b732eb 100644
--- a/marimo/_server/sessions/utils.py
+++ b/marimo/_session/utils.py
@@ -6,12 +6,12 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Optional
from marimo._messaging.serde import serialize_kernel_message
-from marimo._server.model import ConnectionState
+from marimo._session.model import ConnectionState
from marimo._types.ids import ConsumerId
if TYPE_CHECKING:
from marimo._messaging.notification import NotificationMessage
- from marimo._server.sessions.session import Session
+ from marimo._session.session import Session
def send_message_to_consumer(
diff --git a/marimo/_utils/distributor.py b/marimo/_utils/distributor.py
index a02aa2479d..dd8a745fd5 100644
--- a/marimo/_utils/distributor.py
+++ b/marimo/_utils/distributor.py
@@ -7,7 +7,7 @@ import time
from typing import Any, Callable, Generic, Protocol, TypeVar, Union
from marimo import _loggers
-from marimo._server.types import QueueType
+from marimo._session.queue import QueueType
from marimo._utils.disposable import Disposable
from marimo._utils.typed_connection import TypedConnection
diff --git a/marimo/_server/api/status.py b/marimo/_utils/http.py
similarity index 100%
rename from marimo/_server/api/status.py
rename to marimo/_utils/http.py
diff --git a/marimo/_utils/print.py b/marimo/_utils/print.py
new file mode 100644
index 0000000000..e7499944cd
--- /dev/null
+++ b/marimo/_utils/print.py
@@ -0,0 +1,21 @@
+from __future__ import annotations
+
+from typing import Any
+
+# use spaces instead of a tab to play well with carriage returns;
+# \r\t doesn't appear to overwrite characters at the start of a line,
+# but \r{TAB} does ...
+TAB = " "
+
+
+def print_tabbed(string: str, n_tabs: int = 1) -> None:
+ print_(f"{TAB * n_tabs}{string}")
+
+
+def print_(*args: Any, **kwargs: Any) -> None:
+ try:
+ import click
+
+ click.echo(*args, **kwargs)
+ except ImportError:
+ print(*args, **kwargs) # noqa: T201
diff --git a/marimo/_utils/uv_tree.py b/marimo/_utils/uv_tree.py
index dcd608e45f..5d75ac0978 100644
--- a/marimo/_utils/uv_tree.py
+++ b/marimo/_utils/uv_tree.py
@@ -1,7 +1,17 @@
# Copyright 2026 Marimo. All rights reserved.
from __future__ import annotations
-from marimo._server.models.packages import DependencyTreeNode
+from typing import Optional
+
+import msgspec
+
+
+class DependencyTreeNode(msgspec.Struct, rename="camel"):
+ name: str
+ version: Optional[str]
+ # List of {"kind": "extra"|"group", "value": str}
+ tags: list[dict[str, str]]
+ dependencies: list[DependencyTreeNode]
def parse_name_version(content: str) -> tuple[str, str | None]:
diff --git a/tests/_ai/tools/tools/test_notebooks.py b/tests/_ai/tools/tools/test_notebooks.py
index a364fd4285..3f3d51167b 100644
--- a/tests/_ai/tools/tools/test_notebooks.py
+++ b/tests/_ai/tools/tools/test_notebooks.py
@@ -9,7 +9,7 @@ import pytest
from marimo._ai._tools.base import ToolContext
from marimo._ai._tools.tools.notebooks import GetActiveNotebooks
from marimo._ai._tools.types import EmptyArgs, MarimoNotebookInfo
-from marimo._server.model import ConnectionState
+from marimo._session.model import ConnectionState
from marimo._types.ids import SessionId
diff --git a/tests/_ai/tools/tools/test_tables_variables.py b/tests/_ai/tools/tools/test_tables_variables.py
index 5d8505144e..177307bd2e 100644
--- a/tests/_ai/tools/tools/test_tables_variables.py
+++ b/tests/_ai/tools/tools/test_tables_variables.py
@@ -12,7 +12,7 @@ from marimo._ai._tools.tools.tables_and_variables import (
)
from marimo._data.models import DataTableColumn
from marimo._messaging.notification import VariableValue
-from marimo._server.sessions import Session
+from marimo._session import Session
@dataclass
diff --git a/tests/_pyodide/test_bootstrap.py b/tests/_pyodide/test_bootstrap.py
index d2abfbb444..9d77069845 100644
--- a/tests/_pyodide/test_bootstrap.py
+++ b/tests/_pyodide/test_bootstrap.py
@@ -10,8 +10,8 @@ from marimo._config.config import DEFAULT_CONFIG
from marimo._messaging.msgspec_encoder import encode_json_str
from marimo._pyodide.bootstrap import create_session, save_file
from marimo._pyodide.pyodide_session import PyodideSession
-from marimo._server.model import SessionMode
from marimo._server.models.models import SaveNotebookRequest
+from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
diff --git a/tests/_pyodide/test_pyodide_session.py b/tests/_pyodide/test_pyodide_session.py
index e6232991db..d280738625 100644
--- a/tests/_pyodide/test_pyodide_session.py
+++ b/tests/_pyodide/test_pyodide_session.py
@@ -46,8 +46,8 @@ from marimo._runtime.commands import (
ValidateSQLCommand,
)
from marimo._runtime.context.types import teardown_context
-from marimo._server.model import SessionMode
-from marimo._server.notebook import AppFileManager
+from marimo._session.model import SessionMode
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import CellId_t, UIElementId
if TYPE_CHECKING:
diff --git a/tests/_runtime/test_app_mode.py b/tests/_runtime/test_app_mode.py
index 3a6f5c57b9..7e996f70ec 100644
--- a/tests/_runtime/test_app_mode.py
+++ b/tests/_runtime/test_app_mode.py
@@ -9,7 +9,7 @@ from marimo._runtime.context import (
from marimo._runtime.context.kernel_context import KernelRuntimeContext
from marimo._runtime.context.script_context import ScriptRuntimeContext
from marimo._runtime.context.utils import get_mode
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
def test_get_mode_kernel_run():
diff --git a/tests/_runtime/test_runtime.py b/tests/_runtime/test_runtime.py
index 9389dbb8c4..7de42d438b 100644
--- a/tests/_runtime/test_runtime.py
+++ b/tests/_runtime/test_runtime.py
@@ -45,7 +45,7 @@ from marimo._runtime.dataflow import EdgeWithVar
from marimo._runtime.patches import create_main_module
from marimo._runtime.runtime import Kernel, notebook_dir, notebook_location
from marimo._runtime.scratch import SCRATCH_CELL_ID
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._utils.parse_dataclass import parse_raw
from tests._messaging.mocks import MockStderr, MockStream
from tests.conftest import ExecReqProvider, MockedKernel
diff --git a/tests/_server/ai/test_ai_config.py b/tests/_server/ai/test_ai_config.py
index 0f9bb7e750..255814c21c 100644
--- a/tests/_server/ai/test_ai_config.py
+++ b/tests/_server/ai/test_ai_config.py
@@ -24,7 +24,7 @@ from marimo._server.ai.config import (
)
from marimo._server.ai.constants import DEFAULT_MAX_TOKENS, DEFAULT_MODEL
from marimo._server.ai.tools.types import ToolDefinition
-from marimo._server.api.status import HTTPStatus
+from marimo._utils.http import HTTPStatus
class TestAnyProviderConfig:
diff --git a/tests/_server/api/endpoints/test_auto_instantiate.py b/tests/_server/api/endpoints/test_auto_instantiate.py
index f03aab2d87..470664b5a2 100644
--- a/tests/_server/api/endpoints/test_auto_instantiate.py
+++ b/tests/_server/api/endpoints/test_auto_instantiate.py
@@ -6,7 +6,7 @@ from __future__ import annotations
from typing import TYPE_CHECKING
from marimo._messaging.notification import KernelReadyNotification
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._utils.parse_dataclass import parse_raw
from tests._server.mocks import token_header
diff --git a/tests/_server/api/endpoints/test_files.py b/tests/_server/api/endpoints/test_files.py
index 5048bba65e..56d3499918 100644
--- a/tests/_server/api/endpoints/test_files.py
+++ b/tests/_server/api/endpoints/test_files.py
@@ -380,7 +380,7 @@ def test_rename_propagates(
@with_session(SESSION_ID)
def test_read_code_without_saved_file(client: TestClient) -> None:
"""Test read_code when file hasn't been saved yet."""
- from marimo._server.api.status import HTTPStatus
+ from marimo._utils.http import HTTPStatus
# Mock the session to have no file path
with patch("marimo._server.api.endpoints.files.AppState") as mock_state:
diff --git a/tests/_server/api/endpoints/test_resume_session.py b/tests/_server/api/endpoints/test_resume_session.py
index 3ee506ce59..f2618835af 100644
--- a/tests/_server/api/endpoints/test_resume_session.py
+++ b/tests/_server/api/endpoints/test_resume_session.py
@@ -14,7 +14,7 @@ from marimo._messaging.notification import (
KernelCapabilitiesNotification,
KernelReadyNotification,
)
-from marimo._server.sessions import Session
+from marimo._session import Session
from marimo._types.ids import SessionId
from marimo._utils.parse_dataclass import parse_raw
from tests._server.conftest import get_session_manager
diff --git a/tests/_server/api/endpoints/test_terminal.py b/tests/_server/api/endpoints/test_terminal.py
index 9d5f368125..a44100c041 100644
--- a/tests/_server/api/endpoints/test_terminal.py
+++ b/tests/_server/api/endpoints/test_terminal.py
@@ -20,8 +20,8 @@ from marimo._server.api.endpoints.terminal import (
_setup_child_process,
_should_close_on_command,
)
-from marimo._server.model import SessionMode
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
+from marimo._session.model import SessionMode
from tests._server.conftest import get_session_manager
if TYPE_CHECKING:
diff --git a/tests/_server/api/endpoints/test_ws.py b/tests/_server/api/endpoints/test_ws.py
index 78ae3922f7..b9dbe338f6 100644
--- a/tests/_server/api/endpoints/test_ws.py
+++ b/tests/_server/api/endpoints/test_ws.py
@@ -17,8 +17,8 @@ from marimo._messaging.notification import (
KernelReadyNotification,
)
from marimo._server.codes import WebSocketCodes
-from marimo._server.model import SessionMode
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
+from marimo._session.model import SessionMode
from marimo._utils.parse_dataclass import parse_raw
from tests._server.conftest import get_session_manager, get_user_config_manager
from tests._server.mocks import token_header
@@ -212,7 +212,6 @@ def test_fails_on_multiple_connections_with_same_file(
client.post("/api/kernel/shutdown", headers=HEADERS)
async def test_file_watcher_calls_reload(client: TestClient) -> None:
session_manager: SessionManager = get_session_manager(client)
session_manager.mode = SessionMode.RUN
@@ -232,8 +231,15 @@ async def test_file_watcher_calls_reload(client: TestClient) -> None:
assert session_manager._watcher_manager._watchers
watcher = list(session_manager._watcher_manager._watchers.values())[0]
await watcher.callback(Path(filename))
- data = websocket.receive_json()
- assert data == {"op": "reload", "data": {"op": "reload"}}
+ # Drain messages until we get the reload message
+ # (other messages like 'variables' may arrive first)
+ expected = {"op": "reload", "data": {"op": "reload"}}
+ for _ in range(10):
+ data = websocket.receive_json()
+ if data == expected:
+ break
+ else:
+ raise AssertionError(f"Expected {expected}, but never received it")
session_manager.mode = SessionMode.EDIT
session_manager.watch = False
client.post("/api/kernel/shutdown", headers=HEADERS)
diff --git a/tests/_server/api/test_middleware.py b/tests/_server/api/test_middleware.py
index 91fc6ba263..2e316abfbd 100644
--- a/tests/_server/api/test_middleware.py
+++ b/tests/_server/api/test_middleware.py
@@ -26,9 +26,9 @@ from marimo._server.api.middleware import (
from marimo._server.main import (
create_starlette_app,
)
-from marimo._server.model import SessionMode
from marimo._server.tokens import AuthToken
from marimo._server.utils import find_free_port
+from marimo._session.model import SessionMode
from tests._server.mocks import get_mock_session_manager, token_header
if TYPE_CHECKING:
diff --git a/tests/_server/conftest.py b/tests/_server/conftest.py
index 089dd30e29..7187697b90 100644
--- a/tests/_server/conftest.py
+++ b/tests/_server/conftest.py
@@ -14,9 +14,9 @@ from marimo._config.manager import MarimoConfigManager, UserConfigManager
from marimo._config.utils import CONFIG_FILENAME
from marimo._server.api.deps import AppState
from marimo._server.main import create_starlette_app
-from marimo._server.session.session_view import SessionView
-from marimo._server.sessions import SessionManager
+from marimo._server.session_manager import SessionManager
from marimo._server.utils import initialize_asyncio
+from marimo._session.state.session_view import SessionView
from tests._server.mocks import get_mock_session_manager
from tests.utils import assert_serialize_roundtrip
diff --git a/tests/_server/export/test_exporter.py b/tests/_server/export/test_exporter.py
index 2fc012c717..1839da2922 100644
--- a/tests/_server/export/test_exporter.py
+++ b/tests/_server/export/test_exporter.py
@@ -21,8 +21,8 @@ from marimo._server.export import (
)
from marimo._server.export.exporter import Exporter
from marimo._server.models.export import ExportAsHTMLRequest
-from marimo._server.notebook import AppFileManager
-from marimo._server.session.session_view import SessionView
+from marimo._session.notebook import AppFileManager
+from marimo._session.state.session_view import SessionView
from marimo._utils.marimo_path import MarimoPath
from tests.mocks import snapshotter
diff --git a/tests/_server/mocks.py b/tests/_server/mocks.py
index 1fb6e2f721..18d92a6f47 100644
--- a/tests/_server/mocks.py
+++ b/tests/_server/mocks.py
@@ -8,9 +8,9 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, cast
from marimo._config.manager import get_default_config_manager
from marimo._server.file_router import AppFileRouter
from marimo._server.lsp import NoopLspServer
-from marimo._server.model import SessionMode
-from marimo._server.sessions.session_manager import SessionManager
+from marimo._server.session_manager import SessionManager
from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.model import SessionMode
from marimo._utils.marimo_path import MarimoPath
if TYPE_CHECKING:
diff --git a/tests/_server/templates/test_templates.py b/tests/_server/templates/test_templates.py
index a6100e572e..aad259c4b6 100644
--- a/tests/_server/templates/test_templates.py
+++ b/tests/_server/templates/test_templates.py
@@ -27,9 +27,9 @@ from marimo._schemas.session import (
NotebookSessionV1,
StreamOutput,
)
-from marimo._server.model import SessionMode
from marimo._server.templates import templates
from marimo._server.tokens import SkewProtectionToken
+from marimo._session.model import SessionMode
from marimo._utils.code import hash_code
from tests._server.templates.utils import normalize_index_html
from tests.mocks import snapshotter
diff --git a/tests/_server/test_errors.py b/tests/_server/test_errors.py
index a635381e08..5ce9c0ec4e 100644
--- a/tests/_server/test_errors.py
+++ b/tests/_server/test_errors.py
@@ -6,9 +6,9 @@ import msgspec
from starlette.exceptions import HTTPException
from starlette.requests import Request
-from marimo._server.api.status import HTTPException as MarimoHTTPException
from marimo._server.errors import handle_error
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
+from marimo._utils.http import HTTPException as MarimoHTTPException
async def test_http_exception():
diff --git a/tests/_server/test_file_manager.py b/tests/_server/test_file_manager.py
index bb4a3f1b14..bb9061adae 100644
--- a/tests/_server/test_file_manager.py
+++ b/tests/_server/test_file_manager.py
@@ -9,11 +9,11 @@ import pytest
from marimo import __version__
from marimo._ast.app import App, InternalApp
from marimo._ast.cell import CellConfig
-from marimo._server.api.status import HTTPException, HTTPStatus
from marimo._server.models.models import SaveNotebookRequest
-from marimo._server.notebook import AppFileManager
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import CellId_t
from marimo._utils.cell_matching import similarity_score
+from marimo._utils.http import HTTPException, HTTPStatus
if TYPE_CHECKING:
from collections.abc import Generator
diff --git a/tests/_server/test_file_manager_absolute_path.py b/tests/_server/test_file_manager_absolute_path.py
index f349a9af2c..029ad4af75 100644
--- a/tests/_server/test_file_manager_absolute_path.py
+++ b/tests/_server/test_file_manager_absolute_path.py
@@ -8,8 +8,8 @@ from pathlib import Path
import pytest
-from marimo._server.api.status import HTTPException, HTTPStatus
from marimo._server.file_router import AppFileRouter
+from marimo._utils.http import HTTPException, HTTPStatus
class TestAbsoluteDirectoryPath:
diff --git a/tests/_server/test_file_manager_filename.py b/tests/_server/test_file_manager_filename.py
index 85ad1de88c..c2ba0b5758 100644
--- a/tests/_server/test_file_manager_filename.py
+++ b/tests/_server/test_file_manager_filename.py
@@ -5,8 +5,8 @@ from pathlib import Path
import pytest
-from marimo._server.api.status import HTTPException
-from marimo._server.notebook import AppFileManager
+from marimo._session.notebook import AppFileManager
+from marimo._utils.http import HTTPException
from tests.mocks import EDGE_CASE_FILENAMES
diff --git a/tests/_server/test_file_router.py b/tests/_server/test_file_router.py
index 37cec5a801..7c125a6f3d 100644
--- a/tests/_server/test_file_router.py
+++ b/tests/_server/test_file_router.py
@@ -8,7 +8,6 @@ from pathlib import Path
import pytest
-from marimo._server.api.status import HTTPException, HTTPStatus
from marimo._server.file_router import (
AppFileRouter,
LazyListOfFilesAppFileRouter,
@@ -19,6 +18,7 @@ from marimo._server.file_router import (
validate_inside_directory,
)
from marimo._server.models.home import MarimoFile
+from marimo._utils.http import HTTPException, HTTPStatus
file_contents = """
import marimo
diff --git a/tests/_server/test_session_manager.py b/tests/_server/test_session_manager.py
index 28c1501d2b..fb9a6e869e 100644
--- a/tests/_server/test_session_manager.py
+++ b/tests/_server/test_session_manager.py
@@ -7,17 +7,17 @@ from unittest.mock import MagicMock, Mock
import pytest
from marimo._config.manager import get_default_config_manager
-from marimo._server.consumer import SessionConsumer
from marimo._server.file_router import AppFileRouter
from marimo._server.lsp import LspServer
-from marimo._server.model import ConnectionState, SessionMode
-from marimo._server.notebook import AppFileManager
-from marimo._server.sessions import (
+from marimo._server.session_manager import SessionManager
+from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session import (
KernelManager,
Session,
- SessionManager,
)
-from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.consumer import SessionConsumer
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import SessionId
if TYPE_CHECKING:
diff --git a/tests/_server/test_sessions.py b/tests/_server/test_sessions.py
index f26c599b39..3cc6419d71 100644
--- a/tests/_server/test_sessions.py
+++ b/tests/_server/test_sessions.py
@@ -36,22 +36,22 @@ from marimo._runtime.commands import (
SyncGraphCommand,
UpdateUIElementCommand,
)
-from marimo._server.consumer import SessionConsumer
from marimo._server.file_router import AppFileRouter
-from marimo._server.model import ConnectionState, SessionMode
-from marimo._server.notebook import AppFileManager
-from marimo._server.session.session_view import SessionView
-from marimo._server.sessions import Session
-from marimo._server.sessions.events import SessionEventBus
-from marimo._server.sessions.managers import (
+from marimo._server.session_manager import SessionManager
+from marimo._server.utils import initialize_asyncio
+from marimo._session import Session
+from marimo._session.consumer import SessionConsumer
+from marimo._session.events import SessionEventBus
+from marimo._session.managers import (
KernelManagerImpl,
QueueManagerImpl,
)
-from marimo._server.sessions.session import (
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.notebook import AppFileManager
+from marimo._session.session import (
SessionImpl,
)
-from marimo._server.sessions.session_manager import SessionManager
-from marimo._server.utils import initialize_asyncio
+from marimo._session.state.session_view import SessionView
from marimo._types.ids import ConsumerId, SessionId
from marimo._utils.marimo_path import MarimoPath
diff --git a/tests/_server/sessions/test_token_manager.py b/tests/_server/test_token_manager.py
similarity index 96%
rename from tests/_server/sessions/test_token_manager.py
rename to tests/_server/test_token_manager.py
index 7564db5dfe..607c857906 100644
--- a/tests/_server/sessions/test_token_manager.py
+++ b/tests/_server/test_token_manager.py
@@ -5,9 +5,9 @@ from __future__ import annotations
import pytest
-from marimo._server.model import SessionMode
-from marimo._server.sessions.token_manager import TokenManager
+from marimo._server.token_manager import TokenManager
from marimo._server.tokens import AuthToken, SkewProtectionToken
+from marimo._session.model import SessionMode
def test_token_manager_edit_mode_random_tokens() -> None:
diff --git a/tests/_server/test_utils_filename.py b/tests/_server/test_utils_filename.py
index 62b0e17c0a..cb7418041c 100644
--- a/tests/_server/test_utils_filename.py
+++ b/tests/_server/test_utils_filename.py
@@ -5,7 +5,7 @@ import os
import pytest
-from marimo._server.utils import canonicalize_filename
+from marimo._session.notebook.file_manager import canonicalize_filename
class TestCanonicalizeFilename:
diff --git a/tests/_server/sessions/__init__.py b/tests/_session/__init__.py
similarity index 100%
rename from tests/_server/sessions/__init__.py
rename to tests/_session/__init__.py
diff --git a/tests/_session/conftest.py b/tests/_session/conftest.py
new file mode 100644
index 0000000000..c3f1133482
--- /dev/null
+++ b/tests/_session/conftest.py
@@ -0,0 +1,23 @@
+# Copyright 2026 Marimo. All rights reserved.
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+import pytest
+
+from marimo._session.state.session_view import SessionView
+from tests.utils import assert_serialize_roundtrip
+
+if TYPE_CHECKING:
+ from collections.abc import Generator
+
+
+def session_view() -> Generator[SessionView, None, None]:
+ sv = SessionView()
+
+ yield sv
+
+ # Test all operations can be serialized/deserialized
+ for operation in sv.notifications:
+ assert_serialize_roundtrip(operation)
diff --git a/tests/_session/extensions/__init__.py b/tests/_session/extensions/__init__.py
new file mode 100644
index 0000000000..fe2d2e388e
--- /dev/null
+++ b/tests/_session/extensions/__init__.py
@@ -0,0 +1 @@
+# Copyright 2026 Marimo. All rights reserved.
diff --git a/tests/_server/sessions/extensions/test_extensions.py b/tests/_session/extensions/test_extensions.py
similarity index 96%
rename from tests/_server/sessions/extensions/test_extensions.py
rename to tests/_session/extensions/test_extensions.py
index 0e528b5891..746d447aa7 100644
--- a/tests/_server/sessions/extensions/test_extensions.py
+++ b/tests/_session/extensions/test_extensions.py
@@ -8,9 +8,8 @@ from unittest.mock import Mock, patch
import pytest
-from marimo._server.model import ConnectionState, SessionMode
-from marimo._server.sessions.events import SessionEventBus
-from marimo._server.sessions.extensions.extensions import (
+from marimo._session.events import SessionEventBus
+from marimo._session.extensions.extensions import (
CachingExtension,
HeartbeatExtension,
LoggingExtension,
@@ -19,7 +18,8 @@ from marimo._server.sessions.extensions.extensions import (
ReplayExtension,
SessionViewExtension,
)
-from marimo._server.sessions.types import KernelState
+from marimo._session.model import ConnectionState, SessionMode
+from marimo._session.types import KernelState
from marimo._types.ids import CellId_t, RequestId, SessionId
@@ -88,7 +88,7 @@ class TestCachingExtension:
assert extension.session_cache_manager is None
- @patch("marimo._server.sessions.extensions.extensions.SessionCacheManager")
+ @patch("marimo._session.extensions.extensions.SessionCacheManager")
def test_lifecycle(self, mock_cache_cls, mock_session, event_bus) -> None:
"""Test cache manager creation, start, and stop."""
mock_cache = Mock()
@@ -106,7 +106,7 @@ class TestCachingExtension:
mock_cache.stop.assert_called_once()
- @patch("marimo._server.sessions.extensions.extensions.SessionCacheManager")
+ @patch("marimo._session.extensions.extensions.SessionCacheManager")
async def test_rename_updates_path(
self, mock_cache_cls, mock_session, event_bus
) -> None:
@@ -146,9 +146,7 @@ class TestNotificationListenerExtension:
manager.stream_queue = asyncio.Queue()
return manager
- @patch(
- "marimo._server.sessions.extensions.extensions.ConnectionDistributor"
- )
+ @patch("marimo._session.extensions.extensions.ConnectionDistributor")
def test_lifecycle(
self, mock_dist, mock_session, event_bus, kernel_manager, queue_manager
) -> None:
diff --git a/tests/_session/notebook/__init__.py b/tests/_session/notebook/__init__.py
new file mode 100644
index 0000000000..fe2d2e388e
--- /dev/null
+++ b/tests/_session/notebook/__init__.py
@@ -0,0 +1 @@
+# Copyright 2026 Marimo. All rights reserved.
diff --git a/tests/_server/notebook/test_serializer.py b/tests/_session/notebook/test_serializer.py
similarity index 98%
rename from tests/_server/notebook/test_serializer.py
rename to tests/_session/notebook/test_serializer.py
index 7acd099404..474579ca78 100644
--- a/tests/_server/notebook/test_serializer.py
+++ b/tests/_session/notebook/test_serializer.py
@@ -1,6 +1,8 @@
# Copyright 2026 Marimo. All rights reserved.
"""Tests for serializer.py"""
+from __future__ import annotations
+
from pathlib import Path
import pytest
@@ -11,7 +13,7 @@ from marimo._schemas.serialization import (
Header,
NotebookSerializationV1,
)
-from marimo._server.notebook.serializer import (
+from marimo._session.notebook.serializer import (
DEFAULT_FORMAT_HANDLERS,
MarkdownNotebookSerializer,
PythonNotebookSerializer,
diff --git a/tests/_server/notebook/test_storage.py b/tests/_session/notebook/test_storage.py
similarity index 97%
rename from tests/_server/notebook/test_storage.py
rename to tests/_session/notebook/test_storage.py
index c107aa3594..80c74a862e 100644
--- a/tests/_server/notebook/test_storage.py
+++ b/tests/_session/notebook/test_storage.py
@@ -1,12 +1,14 @@
# Copyright 2026 Marimo. All rights reserved.
"""Tests for storage.py"""
+from __future__ import annotations
+
from pathlib import Path
import pytest
-from marimo._server.api.status import HTTPException
-from marimo._server.notebook.storage import FilesystemStorage
+from marimo._session.notebook.storage import FilesystemStorage
+from marimo._utils.http import HTTPException
class TestFilesystemStorage:
diff --git a/tests/_session/state/__init__.py b/tests/_session/state/__init__.py
new file mode 100644
index 0000000000..fe2d2e388e
--- /dev/null
+++ b/tests/_session/state/__init__.py
@@ -0,0 +1 @@
+# Copyright 2026 Marimo. All rights reserved.
diff --git a/tests/_server/session/snapshots/README.md b/tests/_session/state/snapshots/README.md
similarity index 100%
rename from tests/_server/session/snapshots/README.md
rename to tests/_session/state/snapshots/README.md
diff --git a/tests/_server/session/snapshots/basic_session.json b/tests/_session/state/snapshots/basic_session.json
similarity index 100%
rename from tests/_server/session/snapshots/basic_session.json
rename to tests/_session/state/snapshots/basic_session.json
diff --git a/tests/_server/session/snapshots/console_session.json b/tests/_session/state/snapshots/console_session.json
similarity index 100%
rename from tests/_server/session/snapshots/console_session.json
rename to tests/_session/state/snapshots/console_session.json
diff --git a/tests/_server/session/snapshots/error_session.json b/tests/_session/state/snapshots/error_session.json
similarity index 100%
rename from tests/_server/session/snapshots/error_session.json
rename to tests/_session/state/snapshots/error_session.json
diff --git a/tests/_server/session/snapshots/mime_bundle_session.json b/tests/_session/state/snapshots/mime_bundle_session.json
similarity index 100%
rename from tests/_server/session/snapshots/mime_bundle_session.json
rename to tests/_session/state/snapshots/mime_bundle_session.json
diff --git a/tests/_server/session/snapshots/mixed_error_session.json b/tests/_session/state/snapshots/mixed_error_session.json
similarity index 100%
rename from tests/_server/session/snapshots/mixed_error_session.json
rename to tests/_session/state/snapshots/mixed_error_session.json
diff --git a/tests/_server/session/test_serialize_session.py b/tests/_session/state/test_serialize_session.py
similarity index 99%
rename from tests/_server/session/test_serialize_session.py
rename to tests/_session/state/test_serialize_session.py
index c820de4a2d..dbac17d9f2 100644
--- a/tests/_server/session/test_serialize_session.py
+++ b/tests/_session/state/test_serialize_session.py
@@ -16,7 +16,7 @@ from marimo._messaging.errors import MarimoExceptionRaisedError, UnknownError
from marimo._messaging.notification import CellNotification
from marimo._runtime.commands import ExecuteCellsCommand
from marimo._schemas.session import NotebookSessionV1
-from marimo._server.session.serialize import (
+from marimo._session.state.serialize import (
SessionCacheKey,
SessionCacheManager,
SessionCacheWriter,
@@ -26,7 +26,7 @@ from marimo._server.session.serialize import (
serialize_notebook,
serialize_session_view,
)
-from marimo._server.session.session_view import SessionView
+from marimo._session.state.session_view import SessionView
from marimo._types.ids import CellId_t
from tests.mocks import snapshotter
diff --git a/tests/_server/session/test_serialize_session_missing_type.py b/tests/_session/state/test_serialize_session_missing_type.py
similarity index 90%
rename from tests/_server/session/test_serialize_session_missing_type.py
rename to tests/_session/state/test_serialize_session_missing_type.py
index b61f107064..a1238ba46f 100644
--- a/tests/_server/session/test_serialize_session_missing_type.py
+++ b/tests/_session/state/test_serialize_session_missing_type.py
@@ -2,8 +2,8 @@ from __future__ import annotations
from marimo._messaging.cell_output import CellChannel, CellOutput
from marimo._messaging.notification import CellNotification
-from marimo._server.session.serialize import serialize_session_view
-from marimo._server.session.session_view import SessionView
+from marimo._session.state.serialize import serialize_session_view
+from marimo._session.state.session_view import SessionView
def test_serialize_session_with_dict_error_missing_type():
diff --git a/tests/_server/session/test_session_view.py b/tests/_session/state/test_session_view.py
similarity index 99%
rename from tests/_server/session/test_session_view.py
rename to tests/_session/state/test_session_view.py
index b8da15872a..5e4e35e321 100644
--- a/tests/_server/session/test_session_view.py
+++ b/tests/_session/state/test_session_view.py
@@ -39,7 +39,7 @@ from marimo._runtime.commands import (
ExecuteCellsCommand,
UpdateUIElementCommand,
)
-from marimo._server.session.session_view import SessionView
+from marimo._session.state.session_view import SessionView
from marimo._sql.engines.duckdb import INTERNAL_DUCKDB_ENGINE
from marimo._types.ids import CellId_t, RequestId, VariableName, WidgetModelId
from marimo._utils.parse_dataclass import parse_raw
diff --git a/tests/_server/sessions/test_file_change_handler.py b/tests/_session/test_file_change_handler.py
similarity index 99%
rename from tests/_server/sessions/test_file_change_handler.py
rename to tests/_session/test_file_change_handler.py
index 8b73c39c6a..f0482ad091 100644
--- a/tests/_server/sessions/test_file_change_handler.py
+++ b/tests/_session/test_file_change_handler.py
@@ -18,12 +18,12 @@ from marimo._messaging.notification import (
)
from marimo._runtime.commands import DeleteCellCommand, SyncGraphCommand
from marimo._server.models.models import SaveNotebookRequest
-from marimo._server.notebook import AppFileManager
-from marimo._server.sessions.file_change_handler import (
+from marimo._session.file_change_handler import (
EditModeReloadStrategy,
FileChangeCoordinator,
RunModeReloadStrategy,
)
+from marimo._session.notebook import AppFileManager
from marimo._types.ids import CellId_t
if TYPE_CHECKING:
diff --git a/tests/_server/sessions/test_file_watcher_integration.py b/tests/_session/test_file_watcher_integration.py
similarity index 96%
rename from tests/_server/sessions/test_file_watcher_integration.py
rename to tests/_session/test_file_watcher_integration.py
index 2b9bf07ab4..75f294d494 100644
--- a/tests/_server/sessions/test_file_watcher_integration.py
+++ b/tests/_session/test_file_watcher_integration.py
@@ -8,11 +8,11 @@ from unittest.mock import AsyncMock, MagicMock
import pytest
-from marimo._server.sessions.events import SessionEventBus
-from marimo._server.sessions.file_watcher_integration import (
+from marimo._session.events import SessionEventBus
+from marimo._session.file_watcher_integration import (
SessionFileWatcherExtension,
)
-from marimo._server.sessions.session_repository import SessionRepository
+from marimo._session.session_repository import SessionRepository
from marimo._types.ids import SessionId
from marimo._utils.file_watcher import FileWatcherManager
diff --git a/tests/_server/sessions/test_resume_strategies.py b/tests/_session/test_resume_strategies.py
similarity index 97%
rename from tests/_server/sessions/test_resume_strategies.py
rename to tests/_session/test_resume_strategies.py
index 01cb3b05ca..e3045bbbbf 100644
--- a/tests/_server/sessions/test_resume_strategies.py
+++ b/tests/_session/test_resume_strategies.py
@@ -9,12 +9,12 @@ from unittest.mock import MagicMock
import pytest
from marimo._server.exceptions import InvalidSessionException
-from marimo._server.model import ConnectionState
-from marimo._server.sessions.resume_strategies import (
+from marimo._session.model import ConnectionState
+from marimo._session.resume_strategies import (
EditModeResumeStrategy,
RunModeResumeStrategy,
)
-from marimo._server.sessions.session_repository import SessionRepository
+from marimo._session.session_repository import SessionRepository
from marimo._types.ids import SessionId
diff --git a/tests/conftest.py b/tests/conftest.py
index 5e1eb23ea1..0a67a20ad8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -40,7 +40,7 @@ from marimo._runtime.input_override import input_override
from marimo._runtime.marimo_pdb import MarimoPdb
from marimo._runtime.runtime import Kernel
from marimo._save.stubs.module_stub import ModuleStub
-from marimo._server.model import SessionMode
+from marimo._session.model import SessionMode
from marimo._types.ids import CellId_t
if TYPE_CHECKING: