A reactive notebook for Python — run reproducible experiments, query with SQL, execute as a script, deploy as an app, and version with git. Stored as pure Python. All in a modern, AI-native editor.
Python artificial-intelligencedagdata-sciencedata-visualizationdataflowdeveloper-toolsmachine-learningnotebookspipelinepythonreactivesqlweb-app
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__.pyindex 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.pyindex 01a655de15..cc25ec74f5 100644--- a/tests/_ast/test_compiler.py+++ b/tests/_ast/test_compiler.py@@ -9,7 +9,7 @@ from unittest.mock import patchimport pytestfrom marimo._ast import compiler-from marimo._ast.app import CellManager+from marimo._ast.cell_manager import CellManagerfrom marimo._ast.visitor import ImportData, VariableDatafrom marimo._dependencies.dependencies import DependencyManagerdiff --git a/tests/_ast/test_visitor.py b/tests/_ast/test_visitor.pyindex b72cd818d9..1464ddcfcb 100644--- a/tests/_ast/test_visitor.py+++ b/tests/_ast/test_visitor.py@@ -9,11 +9,11 @@ import pytestfrom marimo._ast import visitorfrom marimo._ast.errors import ImportStarError+from marimo._ast.sql_visitor import normalize_sql_f_stringfrom marimo._ast.visitor import (AnnotationData,ImportData,VariableData,- normalize_sql_f_string,)from marimo._dependencies.dependencies import DependencyManagerdiff --git a/tests/_runtime/packages/test_pypi_package_manager.py b/tests/_runtime/packages/test_pypi_package_manager.pyindex 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_CHECKINGfrom unittest.mock import MagicMock, patchfrom marimo._ast import compiler+from marimo._runtime.packages.package_manager import PackageDescriptionfrom 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.pyindex 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 SecretsCallbacksfrom marimo._types.ids import RequestIdfrom tests._messaging.mocks import MockStream-from tests._runtime.test_runtime import MockedKernel+from tests.conftest import MockedKernel@pytest.fixturediff --git a/tests/_save/test_cache.py b/tests/_save/test_cache.pyindex 25f93d91f4..39d2cfafd2 100644--- a/tests/_save/test_cache.py+++ b/tests/_save/test_cache.py@@ -14,7 +14,9 @@ from marimo._ast.app import Appfrom marimo._plugins.ui._impl.input import dropdownfrom marimo._runtime.requests import ExecutionRequestfrom 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 UIElementStubfrom tests.conftest import ExecReqProvider, TestableModuleStubdiff --git a/tests/_server/ai/test_ai_config.py b/tests/_server/ai/test_ai_config.pyindex 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_MODELfrom marimo._server.ai.tools.types import ToolDefinitionfrom marimo._server.api.status import HTTPStatusdiff --git a/tests/_server/ai/test_providers.py b/tests/_server/ai/test_providers.pyindex 08778d201e..0edda283f9 100644--- a/tests/_server/ai/test_providers.py+++ b/tests/_server/ai/test_providers.py@@ -6,9 +6,9 @@ import pytestfrom marimo._ai._types import ChatMessagefrom marimo._config.config import AiConfig+from marimo._server.ai.config import AnyProviderConfigfrom 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.pyindex 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, patchimport pytestfrom marimo._dependencies.dependencies import DependencyManager+from marimo._server.ai.config import AnyProviderConfigfrom 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.pyindex 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 HTTPConnectionfrom marimo._config.manager import UserConfigManagerfrom marimo._server.api.auth import (- AppState,CustomAuthenticationMiddleware,CustomSessionMiddleware,validate_auth,)+from marimo._server.api.deps import AppStatefrom marimo._server.api.middleware import AuthBackendfrom marimo._server.main import create_starlette_appfrom tests._server.mocks import get_mock_session_managerdiff --git a/tests/_server/session/test_session_view.py b/tests/_server/session/test_session_view.pyindex 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 Anyfrom unittest.mock import patchfrom 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, CellOutputfrom marimo._messaging.msgspec_encoder import asdict as serializefrom 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.pyindex 4b17963e17..d2053d8c6a 100644--- a/tests/_server/test_session_manager.py+++ b/tests/_server/test_session_manager.py@@ -8,11 +8,11 @@ import pytestfrom marimo._config.manager import get_default_config_managerfrom marimo._server.file_router import AppFileRouter+from marimo._server.lsp import LspServerfrom marimo._server.model import ConnectionState, SessionConsumer, SessionModefrom marimo._server.notebook import AppFileManagerfrom marimo._server.sessions import (KernelManager,- LspServer,Session,SessionManager,)diff --git a/tests/conftest.py b/tests/conftest.pyindex 4fdcdc25ca..99b4eade3a 100644--- a/tests/conftest.py+++ b/tests/conftest.py@@ -13,8 +13,9 @@ from typing import TYPE_CHECKING, Anyimport pytestfrom _pytest import runner-from marimo._ast.app import App, CellManager+from marimo._ast.app import Appfrom marimo._ast.app_config import _AppConfig+from marimo._ast.cell_manager import CellManagerfrom marimo._config.config import DEFAULT_CONFIGfrom marimo._messaging.mimetypes import ConsoleMimeTypefrom marimo._messaging.ops import (@@ -38,7 +39,7 @@ from marimo._runtime.input_override import input_overridefrom marimo._runtime.marimo_pdb import MarimoPdbfrom marimo._runtime.requests import AppMetadata, ExecutionRequestfrom marimo._runtime.runtime import Kernel-from marimo._save.cache import ModuleStub+from marimo._save.stubs.module_stub import ModuleStubfrom marimo._server.model import SessionModefrom marimo._types.ids import CellId_t