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
add simple auto fix button for sql cell (#6590)
Shahmir Varqha406fced286c7
diff --git a/frontend/src/components/editor/errors/auto-fix.tsx b/frontend/src/components/editor/errors/auto-fix.tsxindex 1ffc01359b..c5ed56e078 100644--- a/frontend/src/components/editor/errors/auto-fix.tsx+++ b/frontend/src/components/editor/errors/auto-fix.tsx@@ -1,24 +1,33 @@/* Copyright 2024 Marimo. All rights reserved. */+import { useAtomValue, useSetAtom } from "jotai";import { WrenchIcon } from "lucide-react";import { Button } from "@/components/ui/button";import { Tooltip } from "@/components/ui/tooltip";+import { aiCompletionCellAtom } from "@/core/ai/state";import { notebookAtom, useCellActions } from "@/core/cells/cells";import type { CellId } from "@/core/cells/ids";+import { aiEnabledAtom } from "@/core/config/config";import { getAutoFixes } from "@/core/errors/errors";import type { MarimoError } from "@/core/kernel/messages";import { store } from "@/core/state/jotai";+import { cn } from "@/utils/cn";export const AutoFixButton = ({errors,cellId,+ className,}: {errors: MarimoError[];cellId: CellId;className?: string;}) => {const { createNewCell } = useCellActions();- const autoFixes = errors.flatMap((error) => getAutoFixes(error));+ const aiEnabled = useAtomValue(aiEnabledAtom);+ const autoFixes = errors.flatMap((error) =>+ getAutoFixes(error, { aiEnabled }),+ );+ const setAiCompletionCell = useSetAtom(aiCompletionCellAtom);if (autoFixes.length === 0) {return null;@@ -33,7 +42,7 @@ export const AutoFixButton = ({<Buttonsize="xs"variant="outline"- className="my-2 font-normal"+ className={cn("my-2 font-normal", className)}onClick={() => {const editorView =store.get(notebookAtom).cellHandles[cellId].current?.editorView;@@ -48,6 +57,7 @@ export const AutoFixButton = ({},editor: editorView,cellId: cellId,+ setAiCompletionCell,});// Focus the editoreditorView?.focus();diff --git a/frontend/src/components/editor/output/MarimoErrorOutput.tsx b/frontend/src/components/editor/output/MarimoErrorOutput.tsxindex f460b4cb90..c7bb719c69 100644--- a/frontend/src/components/editor/output/MarimoErrorOutput.tsx+++ b/frontend/src/components/editor/output/MarimoErrorOutput.tsx@@ -533,7 +533,13 @@ export const MarimoErrorOutput = ({</div>);})}- {cellId && <AutoFixButton errors={sqlErrors} cellId={cellId} />}+ {cellId && (+ <AutoFixButton+ errors={sqlErrors}+ cellId={cellId}+ className="mt-2.5"+ />+ )}</div>,);}diff --git a/frontend/src/core/errors/__tests__/errors.test.ts b/frontend/src/core/errors/__tests__/errors.test.tsindex 3c1793e401..720bb8c86d 100644--- a/frontend/src/core/errors/__tests__/errors.test.ts+++ b/frontend/src/core/errors/__tests__/errors.test.ts@@ -16,6 +16,10 @@ describe("getImportCode", () => {});});+const opts = {+ aiEnabled: true,+};+describe("getAutoFixes", () => {it("returns wrap in function fix for multiple-defs error", () => {const error: MarimoError = {@@ -24,7 +28,7 @@ describe("getAutoFixes", () => {cells: ["foo"],};- const fixes = getAutoFixes(error);+ const fixes = getAutoFixes(error, opts);expect(fixes).toHaveLength(1);expect(fixes[0].title).toBe("Fix: Wrap in a function");});@@ -37,11 +41,25 @@ describe("getAutoFixes", () => {raising_cell: null,};- const fixes = getAutoFixes(error);+ const fixes = getAutoFixes(error, opts);expect(fixes).toHaveLength(1);expect(fixes[0].title).toBe("Fix: Add 'import numpy as np'");});+ it("returns sql fix for sql-error error", () => {+ const error: MarimoError = {+ type: "sql-error",+ msg: "syntax error",+ sql_statement: "SELECT * FROM table",+ };++ const fixes = getAutoFixes(error, opts);+ expect(fixes).toHaveLength(1);+ expect(fixes[0].title).toBe("Fix with AI");++ expect(getAutoFixes(error, { aiEnabled: false })).toHaveLength(0);+ });+it("returns no fixes for NameError with unknown import", () => {const error: MarimoError = {type: "exception",@@ -50,7 +68,7 @@ describe("getAutoFixes", () => {raising_cell: null,};- expect(getAutoFixes(error)).toHaveLength(0);+ expect(getAutoFixes(error, opts)).toHaveLength(0);});it("returns no fixes for other error types", () => {@@ -59,6 +77,6 @@ describe("getAutoFixes", () => {msg: "invalid syntax",};- expect(getAutoFixes(error)).toHaveLength(0);+ expect(getAutoFixes(error, opts)).toHaveLength(0);});});diff --git a/frontend/src/core/errors/errors.ts b/frontend/src/core/errors/errors.tsindex c66051ffe5..0cc30d1da8 100644--- a/frontend/src/core/errors/errors.ts+++ b/frontend/src/core/errors/errors.ts@@ -12,10 +12,19 @@ export interface AutoFix {addCodeBelow: (code: string) => void;editor: EditorView | undefined;cellId: CellId;+ setAiCompletionCell?: (cell: {+ cellId: CellId;+ initialPrompt?: string;+ }) => void;}) => Promise<void>;}-export function getAutoFixes(error: MarimoError): AutoFix[] {+export function getAutoFixes(+ error: MarimoError,+ opts: {+ aiEnabled: boolean;+ },+): AutoFix[] {if (error.type === "multiple-defs") {return [{@@ -57,6 +66,25 @@ export function getAutoFixes(error: MarimoError): AutoFix[] {];}+ if (error.type === "sql-error") {+ // Only show AI fix if AI is enabled+ if (!opts.aiEnabled) {+ return [];+ }+ return [+ {+ title: "Fix with AI",+ description: "Fix the SQL statement",+ onFix: async (ctx) => {+ ctx.setAiCompletionCell?.({+ cellId: ctx.cellId,+ initialPrompt: `Fix the SQL statement: ${error.msg}`,+ });+ },+ },+ ];+ }+return [];}diff --git a/marimo/_server/ai/prompts.py b/marimo/_server/ai/prompts.pyindex 772a9cab03..23776e653a 100644--- a/marimo/_server/ai/prompts.py+++ b/marimo/_server/ai/prompts.py@@ -29,8 +29,6 @@ language_rules = {"markdown": [],"sql": ["The SQL must use duckdb syntax.",- 'SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.',- "This will automatically display the result in the UI. You do not need to return the dataframe in the cell.",],}@@ -194,7 +192,7 @@ def get_refactor_or_insert_notebook_cell_system_prompt(if support_multiple_cells:system_prompt += "\n\nAgain, just output code wrapped in cells. Each cell is wrapped in backticks with the appropriate language identifier (python, sql, markdown)."else:- system_prompt += "\n\nAgain, just output the code itself."+ system_prompt += f"\n\nAgain, just output the code itself and make sure to return the code as just {language}."return system_promptdiff --git a/tests/_server/ai/snapshots/chat_system_prompts.txt b/tests/_server/ai/snapshots/chat_system_prompts.txtindex 76c36fbd40..69f3377a28 100644--- a/tests/_server/ai/snapshots/chat_system_prompts.txt+++ b/tests/_server/ai/snapshots/chat_system_prompts.txt@@ -141,8 +141,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.==================== with custom rules ====================@@ -285,8 +283,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Additional rules:Always be polite.@@ -432,8 +428,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Available variables from other cells:- variable: `var1`- variable: `var2`@@ -579,8 +573,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Available variables from other cells:- variable: `df`@@ -732,8 +724,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Available schema:- Table: df_1@@ -893,8 +883,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.<code_from_other_cells>import pandas as pd@@ -1042,8 +1030,6 @@ chart## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Additional rules:Always be polite.diff --git a/tests/_server/ai/snapshots/system_prompts.txt b/tests/_server/ai/snapshots/system_prompts.txtindex 396cb6f08a..b924a95325 100644--- a/tests/_server/ai/snapshots/system_prompts.txt+++ b/tests/_server/ai/snapshots/system_prompts.txt@@ -22,7 +22,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou6. If an import already exists, do not import it again.7. If a variable is already defined, use another name, or make it private by adding an underscore at the beginning.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== markdown ====================@@ -37,7 +37,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou{CELL_CODE}```-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just markdown.==================== sql ====================@@ -54,10 +54,8 @@ Immediately start with the following format. Do NOT comment on the code, just ou## Rules for sql1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just sql.==================== idk ====================@@ -72,7 +70,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou{CELL_CODE}```-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just idk.==================== with custom rules ====================@@ -99,7 +97,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou## Additional rules:Always use type hints.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with context ====================@@ -133,7 +131,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou- Sample values: Alice, Bob, Charlie-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with is_insert=True ====================@@ -164,7 +162,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou6. If an import already exists, do not import it again.7. If a variable is already defined, use another name, or make it private by adding an underscore at the beginning.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with cell_code ====================@@ -201,7 +199,7 @@ print('Hello, world!')6. If an import already exists, do not import it again.7. If a variable is already defined, use another name, or make it private by adding an underscore at the beginning.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with selected_text ====================@@ -238,7 +236,7 @@ print('Hello, world!')6. If an import already exists, do not import it again.7. If a variable is already defined, use another name, or make it private by adding an underscore at the beginning.-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with other_cell_codes ====================@@ -279,7 +277,7 @@ import pandas as pdimport numpy as np</code_from_other_cells>-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with VariableContext objects ====================@@ -312,7 +310,7 @@ Immediately start with the following format. Do NOT comment on the code, just ou- value_preview: <Model object>-Again, just output the code itself.+Again, just output the code itself and make sure to return the code as just python.==================== with support_multiple_cells=True ====================@@ -350,8 +348,6 @@ Separate logic into multiple cells to keep the code organized and readable.## Rules for sql:1. The SQL must use duckdb syntax.-2. SQL cells start with df = mo.sql(f"""<your query>""") for DuckDB, or df = mo.sql(f"""<your query>""", engine=engine) for other SQL engines.-3. This will automatically display the result in the UI. You do not need to return the dataframe in the cell.## Available variables from other cells:- variable: `df`