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
refactor: use Command instead of Request in put_control_request (#7632)
Myles Scolnickc0565f89fbdb
diff --git a/marimo/_cli/development/commands.py b/marimo/_cli/development/commands.pyindex 5c2b33c5b3..6305e42b3c 100644--- a/marimo/_cli/development/commands.py+++ b/marimo/_cli/development/commands.py@@ -231,7 +231,6 @@ def _generate_server_api_schema() -> dict[str, Any]:models.PreviewDatasetColumnRequest,models.PreviewSQLTableRequest,models.ReadCodeResponse,- models.RefreshSecretsRequest,models.RenameNotebookRequest,models.ExecuteCellsRequest,models.SaveAppConfigurationRequest,diff --git a/marimo/_server/api/endpoints/config.py b/marimo/_server/api/endpoints/config.pyindex 17eebcf35d..fbfadb6fbc 100644--- a/marimo/_server/api/endpoints/config.py+++ b/marimo/_server/api/endpoints/config.py@@ -12,6 +12,7 @@ from marimo._config.config import PartialMarimoConfigfrom marimo._dependencies.dependencies import DependencyManagerfrom marimo._messaging.msgspec_encoder import asdictfrom marimo._messaging.notification import MissingPackageAlertNotification+from marimo._runtime.commands import UpdateUserConfigCommandfrom marimo._runtime.packages.utils import is_python_isolatedfrom marimo._server.ai.mcp.config import is_mcp_config_emptyfrom marimo._server.api.deps import AppState@@ -19,7 +20,6 @@ from marimo._server.api.utils import parse_requestfrom marimo._server.models.models import (SaveUserConfigurationRequest,SuccessResponse,- UpdateUserConfigRequest,)from marimo._server.router import APIRouterfrom marimo._session import send_message_to_consumer@@ -111,7 +111,7 @@ async def save_user_config(# Session could be None if the user is on the home pageif session is not None:session.put_control_request(- UpdateUserConfigRequest(config),+ UpdateUserConfigCommand(config),from_consumer_id=ConsumerId(app_state.require_current_session_id()),diff --git a/marimo/_server/api/endpoints/execution.py b/marimo/_server/api/endpoints/execution.pyindex a46bf087e8..41d53bf746 100644--- a/marimo/_server/api/endpoints/execution.py+++ b/marimo/_server/api/endpoints/execution.py@@ -10,7 +10,7 @@ from starlette.responses import JSONResponsefrom marimo import _loggersfrom marimo._messaging.notification import AlertNotification-from marimo._runtime.commands import HTTPRequest+from marimo._runtime.commands import HTTPRequest, UpdateUIElementCommandfrom marimo._server.api.deps import AppStatefrom marimo._server.api.endpoints.ws.ws_connection_validator import (FILE_QUERY_PARAM_KEY,@@ -26,7 +26,6 @@ from marimo._server.models.models import (InstantiateNotebookRequest,InvokeFunctionRequest,SuccessResponse,- UpdateUIElementRequest,UpdateUIElementValuesRequest,UpdateWidgetModelRequest,)@@ -65,7 +64,7 @@ async def set_ui_element_values(app_state = AppState(request)body = await parse_request(request, cls=UpdateUIElementValuesRequest)app_state.require_current_session().put_control_request(- UpdateUIElementRequest(+ UpdateUIElementCommand(object_ids=body.object_ids,values=body.values,token=str(uuid4()),diff --git a/marimo/_server/api/endpoints/files.py b/marimo/_server/api/endpoints/files.pyindex 87bf371a4e..412abd55cf 100644--- a/marimo/_server/api/endpoints/files.py+++ b/marimo/_server/api/endpoints/files.py@@ -87,11 +87,11 @@ async def rename_file("""body = await parse_request(request, cls=RenameNotebookRequest)app_state = AppState(request)+ filename = await abspath(body.filename)# Convert to absolute path- command = RenameNotebookCommand(filename=await abspath(body.filename))app_state.require_current_session().put_control_request(- command,+ RenameNotebookCommand(filename=filename),from_consumer_id=ConsumerId(app_state.require_current_session_id()),)diff --git a/marimo/_server/api/endpoints/secrets.py b/marimo/_server/api/endpoints/secrets.pyindex 6d3d4d1a9c..2f2fced33d 100644--- a/marimo/_server/api/endpoints/secrets.py+++ b/marimo/_server/api/endpoints/secrets.py@@ -7,13 +7,13 @@ from starlette.authentication import requiresfrom starlette.responses import JSONResponsefrom marimo import _loggers+from marimo._runtime.commands import RefreshSecretsCommandfrom marimo._secrets.secrets import write_secretfrom marimo._server.api.deps import AppStatefrom marimo._server.api.utils import dispatch_control_request, parse_requestfrom marimo._server.models.models import (BaseResponse,ListSecretKeysRequest,- RefreshSecretsRequest,SuccessResponse,)from marimo._server.models.secrets import CreateSecretRequest@@ -77,7 +77,7 @@ async def create_secret(request: Request) -> BaseResponse:# Refresh the secretsapp_state.require_current_session().put_control_request(- RefreshSecretsRequest(),+ RefreshSecretsCommand(),from_consumer_id=ConsumerId(session_id),)return SuccessResponse(success=True)diff --git a/marimo/_server/models/models.py b/marimo/_server/models/models.pyindex 067c820c38..d82eb42e2a 100644--- a/marimo/_server/models/models.py+++ b/marimo/_server/models/models.py@@ -23,7 +23,6 @@ from marimo._runtime.commands import (ListSQLTablesCommand,PreviewDatasetColumnCommand,PreviewSQLTableCommand,- RefreshSecretsCommand,UpdateCellConfigCommand,UpdateUIElementCommand,UpdateUserConfigCommand,@@ -87,11 +86,6 @@ class UpdateWidgetModelRequest(UpdateWidgetModelCommand, tag=False):)-class RefreshSecretsRequest(RefreshSecretsCommand, tag=False):- def as_command(self) -> RefreshSecretsCommand:- return RefreshSecretsCommand()--class ListDataSourceConnectionRequest(ListDataSourceConnectionCommand, tag=False):diff --git a/packages/openapi/api.yaml b/packages/openapi/api.yamlindex 7182e2c928..9110c16789 100644--- a/packages/openapi/api.yaml+++ b/packages/openapi/api.yaml@@ -3211,11 +3211,6 @@ components:- typetitle: RefreshSecretsCommandtype: object- RefreshSecretsRequest:- properties: {}- required: []- title: RefreshSecretsRequest- type: objectReloadNotification:properties:op:diff --git a/packages/openapi/src/api.ts b/packages/openapi/src/api.tsindex f8f30188ca..d262e19e22 100644--- a/packages/openapi/src/api.ts+++ b/packages/openapi/src/api.ts@@ -4615,8 +4615,6 @@ export interface components {/** @enum {unknown} */type: "refresh-secrets";};- /** RefreshSecretsRequest */- RefreshSecretsRequest: Record<string, any>;/** ReloadNotification */ReloadNotification: {/** @enum {unknown} */