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.

tests: correct imports to actual file instead of accidental exports (#7490)

Myles Scolnick27ff635f9e53
diff --git a/marimo/_save/loaders/__init__.py b/marimo/_save/loaders/__init__.py
index 3a596e85da..7987bb0ce4 100644
--- a/marimo/_save/loaders/__init__.py
+++ b/marimo/_save/loaders/__init__.py
@@ -21,12 +21,13 @@ PERSISTENT_LOADERS: dict[LoaderKey, LoaderType] = {
}
__all__ = [
- "PERSISTENT_LOADERS",
+ "BasePersistenceLoader",
+ "JsonLoader",
"Loader",
"LoaderKey",
- "BasePersistenceLoader",
"LoaderPartial",
"LoaderType",
"MemoryLoader",
+ "PERSISTENT_LOADERS",
"PickleLoader",
]
diff --git a/tests/_ast/test_compiler.py b/tests/_ast/test_compiler.py
index 01a655de15..cc25ec74f5 100644
--- a/tests/_ast/test_compiler.py
+++ b/tests/_ast/test_compiler.py
@@ -9,7 +9,7 @@ from unittest.mock import patch
import pytest
from marimo._ast import compiler
-from marimo._ast.app import CellManager
+from marimo._ast.cell_manager import CellManager
from marimo._ast.visitor import ImportData, VariableData
from marimo._dependencies.dependencies import DependencyManager
diff --git a/tests/_ast/test_visitor.py b/tests/_ast/test_visitor.py
index b72cd818d9..1464ddcfcb 100644
--- a/tests/_ast/test_visitor.py
+++ b/tests/_ast/test_visitor.py
@@ -9,11 +9,11 @@ import pytest
from marimo._ast import visitor
from marimo._ast.errors import ImportStarError
+from marimo._ast.sql_visitor import normalize_sql_f_string
from marimo._ast.visitor import (
AnnotationData,
ImportData,
VariableData,
- normalize_sql_f_string,
)
from marimo._dependencies.dependencies import DependencyManager
diff --git a/tests/_runtime/packages/test_pypi_package_manager.py b/tests/_runtime/packages/test_pypi_package_manager.py
index e9e31af641..9e78b84d72 100644
--- a/tests/_runtime/packages/test_pypi_package_manager.py
+++ b/tests/_runtime/packages/test_pypi_package_manager.py
@@ -8,8 +8,8 @@ from typing import TYPE_CHECKING
from unittest.mock import MagicMock, patch
from marimo._ast import compiler
+from marimo._runtime.packages.package_manager import PackageDescription
from marimo._runtime.packages.pypi_package_manager import (
- PackageDescription,
PipPackageManager,
PoetryPackageManager,
UvPackageManager,
diff --git a/tests/_runtime/test_runtime_secrets.py b/tests/_runtime/test_runtime_secrets.py
index 27f0803e3c..7cc6b8f9b7 100644
--- a/tests/_runtime/test_runtime_secrets.py
+++ b/tests/_runtime/test_runtime_secrets.py
@@ -13,7 +13,7 @@ from marimo._runtime.requests import (
from marimo._runtime.runtime import SecretsCallbacks
from marimo._types.ids import RequestId
from tests._messaging.mocks import MockStream
-from tests._runtime.test_runtime import MockedKernel
+from tests.conftest import MockedKernel
@pytest.fixture
diff --git a/tests/_save/test_cache.py b/tests/_save/test_cache.py
index 25f93d91f4..39d2cfafd2 100644
--- a/tests/_save/test_cache.py
+++ b/tests/_save/test_cache.py
@@ -14,7 +14,9 @@ from marimo._ast.app import App
from marimo._plugins.ui._impl.input import dropdown
from marimo._runtime.requests import ExecutionRequest
from marimo._runtime.runtime import Kernel
-from marimo._save.cache import Cache, ModuleStub, UIElementStub
+from marimo._save.cache import Cache
+from marimo._save.stubs.module_stub import ModuleStub
+from marimo._save.stubs.ui_element_stub import UIElementStub
from tests.conftest import ExecReqProvider, TestableModuleStub
diff --git a/tests/_server/ai/test_ai_config.py b/tests/_server/ai/test_ai_config.py
index f1e9797152..b38096b9b1 100644
--- a/tests/_server/ai/test_ai_config.py
+++ b/tests/_server/ai/test_ai_config.py
@@ -13,8 +13,6 @@ from marimo._config.config import (
MarimoConfig,
)
from marimo._server.ai.config import (
- DEFAULT_MAX_TOKENS,
- DEFAULT_MODEL,
AnyProviderConfig,
_get_ai_config,
_get_base_url,
@@ -24,6 +22,7 @@ from marimo._server.ai.config import (
get_edit_model,
get_max_tokens,
)
+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
diff --git a/tests/_server/ai/test_providers.py b/tests/_server/ai/test_providers.py
index 08778d201e..0edda283f9 100644
--- a/tests/_server/ai/test_providers.py
+++ b/tests/_server/ai/test_providers.py
@@ -6,9 +6,9 @@ import pytest
from marimo._ai._types import ChatMessage
from marimo._config.config import AiConfig
+from marimo._server.ai.config import AnyProviderConfig
from marimo._server.ai.providers import (
AnthropicProvider,
- AnyProviderConfig,
AzureOpenAIProvider,
BedrockProvider,
GoogleProvider,
diff --git a/tests/_server/api/endpoints/test_ai.py b/tests/_server/api/endpoints/test_ai.py
index bd1f1d3984..9783e97565 100644
--- a/tests/_server/api/endpoints/test_ai.py
+++ b/tests/_server/api/endpoints/test_ai.py
@@ -9,13 +9,13 @@ from unittest.mock import AsyncMock, MagicMock, Mock, patch
import pytest
from marimo._dependencies.dependencies import DependencyManager
+from marimo._server.ai.config import AnyProviderConfig
from marimo._server.ai.prompts import (
FIM_MIDDLE_TAG,
FIM_PREFIX_TAG,
FIM_SUFFIX_TAG,
)
from marimo._server.ai.providers import (
- AnyProviderConfig,
OpenAIProvider,
without_wrapping_backticks,
)
diff --git a/tests/_server/api/test_auth.py b/tests/_server/api/test_auth.py
index 1f3a3b2728..a33cfa2702 100644
--- a/tests/_server/api/test_auth.py
+++ b/tests/_server/api/test_auth.py
@@ -11,11 +11,11 @@ from starlette.requests import HTTPConnection
from marimo._config.manager import UserConfigManager
from marimo._server.api.auth import (
- AppState,
CustomAuthenticationMiddleware,
CustomSessionMiddleware,
validate_auth,
)
+from marimo._server.api.deps import AppState
from marimo._server.api.middleware import AuthBackend
from marimo._server.main import create_starlette_app
from tests._server.mocks import get_mock_session_manager
diff --git a/tests/_server/session/test_session_view.py b/tests/_server/session/test_session_view.py
index 20e68e456f..71e4e80f0c 100644
--- a/tests/_server/session/test_session_view.py
+++ b/tests/_server/session/test_session_view.py
@@ -5,13 +5,18 @@ from typing import Any
from unittest.mock import patch
from marimo._ast.cell import RuntimeStateType
-from marimo._data.models import Database, DataTable, DataTableColumn, Schema
+from marimo._data.models import (
+ Database,
+ DataSourceConnection,
+ DataTable,
+ DataTableColumn,
+ Schema,
+)
from marimo._messaging.cell_output import CellChannel, CellOutput
from marimo._messaging.msgspec_encoder import asdict as serialize
from marimo._messaging.ops import (
CellOp,
Datasets,
- DataSourceConnection,
DataSourceConnections,
InstallingPackageAlert,
SendUIElementMessage,
diff --git a/tests/_server/test_session_manager.py b/tests/_server/test_session_manager.py
index 4b17963e17..d2053d8c6a 100644
--- a/tests/_server/test_session_manager.py
+++ b/tests/_server/test_session_manager.py
@@ -8,11 +8,11 @@ import pytest
from marimo._config.manager import get_default_config_manager
from marimo._server.file_router import AppFileRouter
+from marimo._server.lsp import LspServer
from marimo._server.model import ConnectionState, SessionConsumer, SessionMode
from marimo._server.notebook import AppFileManager
from marimo._server.sessions import (
KernelManager,
- LspServer,
Session,
SessionManager,
)
diff --git a/tests/conftest.py b/tests/conftest.py
index 4fdcdc25ca..99b4eade3a 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -13,8 +13,9 @@ from typing import TYPE_CHECKING, Any
import pytest
from _pytest import runner
-from marimo._ast.app import App, CellManager
+from marimo._ast.app import App
from marimo._ast.app_config import _AppConfig
+from marimo._ast.cell_manager import CellManager
from marimo._config.config import DEFAULT_CONFIG
from marimo._messaging.mimetypes import ConsoleMimeType
from marimo._messaging.ops import (
@@ -38,7 +39,7 @@ from marimo._runtime.input_override import input_override
from marimo._runtime.marimo_pdb import MarimoPdb
from marimo._runtime.requests import AppMetadata, ExecutionRequest
from marimo._runtime.runtime import Kernel
-from marimo._save.cache import ModuleStub
+from marimo._save.stubs.module_stub import ModuleStub
from marimo._server.model import SessionMode
from marimo._types.ids import CellId_t