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
AI autofix mode for sql cells (#6639)
Shahmir Varqha3dbd6a247384
diff --git a/frontend/src/components/editor/ai/ai-completion-editor.tsx b/frontend/src/components/editor/ai/ai-completion-editor.tsxindex 35569b597f..b283e0dd3d 100644--- a/frontend/src/components/editor/ai/ai-completion-editor.tsx+++ b/frontend/src/components/editor/ai/ai-completion-editor.tsx@@ -22,6 +22,7 @@ import { getCodes } from "@/core/codemirror/copilot/getCodes";import type { LanguageAdapterType } from "@/core/codemirror/language/types";import { selectAllText } from "@/core/codemirror/utils";import { useRuntimeManager } from "@/core/runtime/config";+import { useEvent } from "@/hooks/useEvent";import { useTheme } from "@/theme/useTheme";import { cn } from "@/utils/cn";import { prettyError } from "@/utils/errors";@@ -45,6 +46,7 @@ interface Props {declineChange: () => void;acceptChange: (rightHandCode: string) => void;enabled: boolean;+ triggerImmediately?: boolean;/*** Children shown when there is no completion*/@@ -67,6 +69,7 @@ export const AiCompletionEditor: React.FC<Props> = ({declineChange,acceptChange,enabled,+ triggerImmediately,children,}) => {const [completionBody, setCompletionBody] = useState<object>({});@@ -94,7 +97,11 @@ export const AiCompletionEditor: React.FC<Props> = ({// Throttle the messages and data updates to 100msexperimental_throttle: 100,body: {- ...completionBody,+ ...(Object.keys(completionBody).length > 0+ ? completionBody+ : initialPrompt+ ? getAICompletionBody({ input: initialPrompt })+ : {}),includeOtherCode: includeOtherCells ? getCodes(currentCode) : "",code: currentCode,language: currentLanguageAdapter,@@ -114,6 +121,12 @@ export const AiCompletionEditor: React.FC<Props> = ({const inputRef = React.useRef<ReactCodeMirrorRef>(null);const completion = untrimmedCompletion.trimEnd();+ const initialSubmit = useEvent(() => {+ if (triggerImmediately && !isLoading && initialPrompt) {+ handleSubmit();+ }+ });+// Focus the inputuseEffect(() => {if (enabled) {@@ -122,6 +135,7 @@ export const AiCompletionEditor: React.FC<Props> = ({const input = inputRef.current;if (input?.view) {input.view.focus();+ initialSubmit();return true;}return false;@@ -131,7 +145,7 @@ export const AiCompletionEditor: React.FC<Props> = ({selectAllText(inputRef.current?.view);}- }, [enabled]);+ }, [enabled, initialSubmit]);// Reset the input when the prompt changesuseEffect(() => {diff --git a/frontend/src/components/editor/cell/code/cell-editor.tsx b/frontend/src/components/editor/cell/code/cell-editor.tsxindex c6ef30bbe0..a422c97be9 100644--- a/frontend/src/components/editor/cell/code/cell-editor.tsx+++ b/frontend/src/components/editor/cell/code/cell-editor.tsx@@ -407,6 +407,7 @@ const CellEditorInternal = ({<AiCompletionEditorenabled={aiCompletionCell?.cellId === cellId}initialPrompt={aiCompletionCell?.initialPrompt}+ triggerImmediately={aiCompletionCell?.triggerImmediately}currentCode={editorViewRef.current?.state.doc.toString() ?? code}currentLanguageAdapter={languageAdapter}declineChange={useEvent(() => {diff --git a/frontend/src/components/editor/errors/auto-fix.tsx b/frontend/src/components/editor/errors/auto-fix.tsxindex c5ed56e078..d1c6514899 100644--- a/frontend/src/components/editor/errors/auto-fix.tsx+++ b/frontend/src/components/editor/errors/auto-fix.tsx@@ -1,8 +1,14 @@/* Copyright 2024 Marimo. All rights reserved. */-import { useAtomValue, useSetAtom } from "jotai";-import { WrenchIcon } from "lucide-react";+import { useAtomValue, useSetAtom, useStore } from "jotai";+import { ChevronDownIcon, SparklesIcon, WrenchIcon } from "lucide-react";import { Button } from "@/components/ui/button";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "@/components/ui/dropdown-menu";import { Tooltip } from "@/components/ui/tooltip";import { aiCompletionCellAtom } from "@/core/ai/state";import { notebookAtom, useCellActions } from "@/core/cells/cells";@@ -10,8 +16,8 @@ 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";+import { type FixMode, useFixMode } from "./fix-mode";export const AutoFixButton = ({errors,@@ -22,6 +28,7 @@ export const AutoFixButton = ({cellId: CellId;className?: string;}) => {+ const store = useStore();const { createNewCell } = useCellActions();const aiEnabled = useAtomValue(aiEnabledAtom);const autoFixes = errors.flatMap((error) =>@@ -37,35 +44,134 @@ export const AutoFixButton = ({// multiple fixes.const firstFix = autoFixes[0];+ const handleFix = (triggerFix: boolean) => {+ const editorView =+ store.get(notebookAtom).cellHandles[cellId].current?.editorView;+ firstFix.onFix({+ addCodeBelow: (code: string) => {+ createNewCell({+ cellId: cellId,+ autoFocus: false,+ before: false,+ code: code,+ });+ },+ editor: editorView,+ cellId: cellId,+ aiFix: {+ setAiCompletionCell,+ triggerFix,+ },+ });+ // Focus the editor+ editorView?.focus();+ };++ return (+ <div className={cn("my-2", className)}>+ {firstFix.fixType === "ai" ? (+ <AIFixButton+ tooltip={firstFix.description}+ openPrompt={() => handleFix(false)}+ applyAutofix={() => handleFix(true)}+ />+ ) : (+ <Tooltip content={firstFix.description} align="start">+ <Button+ size="xs"+ variant="outline"+ className="font-normal"+ onClick={() => handleFix(false)}+ >+ <WrenchIcon className="h-3 w-3 mr-2" />+ {firstFix.title}+ </Button>+ </Tooltip>+ )}+ </div>+ );+};++const PromptIcon = SparklesIcon;+const AutofixIcon = WrenchIcon;++const PromptTitle = "Suggest a prompt";+const AutofixTitle = "Fix with AI";++export const AIFixButton = ({+ tooltip,+ openPrompt,+ applyAutofix,+}: {+ tooltip: string;+ openPrompt: () => void;+ applyAutofix: () => void;+}) => {+ const { fixMode, setFixMode } = useFixMode();++ return (+ <div className="flex">+ <Tooltip content={tooltip} align="start">+ <Button+ size="xs"+ variant="outline"+ className="font-normal rounded-r-none border-r-0"+ onClick={fixMode === "prompt" ? openPrompt : applyAutofix}+ >+ {fixMode === "prompt" ? (+ <PromptIcon className="h-3 w-3 mr-2 mb-0.5" />+ ) : (+ <AutofixIcon className="h-3 w-3 mr-2 mb-0.5" />+ )}+ {fixMode === "prompt" ? PromptTitle : AutofixTitle}+ </Button>+ </Tooltip>+ <DropdownMenu>+ <DropdownMenuTrigger asChild={true}>+ <Button+ size="xs"+ variant="outline"+ className="rounded-l-none px-2"+ aria-label="Fix options"+ >+ <ChevronDownIcon className="h-3 w-3" />+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="w-56">+ <DropdownMenuItem+ className="flex items-center gap-2"+ onClick={() => {+ setFixMode(fixMode === "prompt" ? "autofix" : "prompt");+ }}+ >+ <AiModeItem mode={fixMode === "prompt" ? "autofix" : "prompt"} />+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ );+};++const AiModeItem = ({ mode }: { mode: FixMode }) => {+ const icon =+ mode === "prompt" ? (+ <PromptIcon className="h-4 w-4" />+ ) : (+ <AutofixIcon className="h-4 w-4" />+ );+ const title = mode === "prompt" ? PromptTitle : AutofixTitle;+ const description =+ mode === "prompt"+ ? "Edit the prompt before applying"+ : "Apply AI fixes automatically";+return (- <Tooltip content={firstFix.description} align="start">- <Button- size="xs"- variant="outline"- className={cn("my-2 font-normal", className)}- onClick={() => {- const editorView =- store.get(notebookAtom).cellHandles[cellId].current?.editorView;- firstFix.onFix({- addCodeBelow: (code: string) => {- createNewCell({- cellId: cellId,- autoFocus: false,- before: false,- code: code,- });- },- editor: editorView,- cellId: cellId,- setAiCompletionCell,- });- // Focus the editor- editorView?.focus();- }}- >- <WrenchIcon className="h-3 w-3 mr-2" />- {firstFix.title}- </Button>- </Tooltip>+ <div className="flex items-center gap-2">+ {icon}+ <div className="flex flex-col">+ <span className="font-medium">{title}</span>+ <span className="text-xs text-muted-foreground">{description}</span>+ </div>+ </div>);};diff --git a/frontend/src/components/editor/errors/fix-mode.ts b/frontend/src/components/editor/errors/fix-mode.tsnew file mode 100644index 0000000000..8adf10d538--- /dev/null+++ b/frontend/src/components/editor/errors/fix-mode.ts@@ -0,0 +1,15 @@+/* Copyright 2024 Marimo. All rights reserved. */++import { useAtom } from "jotai";+import { atomWithStorage } from "jotai/utils";++export type FixMode = "prompt" | "autofix";++const BASE_KEY = "marimo:ai-autofix-mode";++const fixModeAtom = atomWithStorage<FixMode>(BASE_KEY, "autofix");++export function useFixMode() {+ const [fixMode, setFixMode] = useAtom(fixModeAtom);+ return { fixMode, setFixMode };+}diff --git a/frontend/src/core/ai/context/providers/__tests__/datasource.test.ts b/frontend/src/core/ai/context/providers/__tests__/datasource.test.tsindex 1521922438..a3f52fc14d 100644--- a/frontend/src/core/ai/context/providers/__tests__/datasource.test.ts+++ b/frontend/src/core/ai/context/providers/__tests__/datasource.test.ts@@ -2,6 +2,7 @@/* eslint-disable @typescript-eslint/no-explicit-any */import { beforeEach, describe, expect, it } from "vitest";+import type { CellId } from "@/core/cells/ids";import type {ConnectionsMap,DatasetTablesMap,@@ -9,7 +10,7 @@ import type {import { DUCKDB_ENGINE } from "@/core/datasets/engines";import type { DataSourceConnection, DataTable } from "@/core/kernel/messages";import { Boosts, Sections } from "../common";-import { DatasourceContextProvider } from "../datasource";+import { DatasourceContextProvider, getDatasourceContext } from "../datasource";// Mock data for testingconst createMockDataSourceConnection = (@@ -630,3 +631,10 @@ describe("DatasourceContextProvider", () => {});});});++describe("getDatasourceContext", () => {+ it("should return null if no cell ID is found", () => {+ const context = getDatasourceContext("1" as CellId);+ expect(context).toBeNull();+ });+});diff --git a/frontend/src/core/ai/context/providers/datasource.ts b/frontend/src/core/ai/context/providers/datasource.tsindex e37ce32328..04d718189d 100644--- a/frontend/src/core/ai/context/providers/datasource.ts+++ b/frontend/src/core/ai/context/providers/datasource.ts@@ -3,10 +3,14 @@import type { Completion } from "@codemirror/autocomplete";import { createRoot } from "react-dom/client";import { dbDisplayName } from "@/components/databases/display";+import { cellDataAtom } from "@/core/cells/cells";+import type { CellId } from "@/core/cells/ids";+import { LanguageAdapters } from "@/core/codemirror/language/LanguageAdapters";import { renderDatasourceInfo } from "@/core/codemirror/language/languages/sql/renderers";import {type ConnectionsMap,type DatasetTablesMap,+ dataSourceConnectionsAtom,getTableType,} from "@/core/datasets/data-source-connections";import {@@ -14,6 +18,7 @@ import {INTERNAL_SQL_ENGINES,} from "@/core/datasets/engines";import type { DataSourceConnection, DataTable } from "@/core/kernel/messages";+import { store } from "@/core/state/jotai";import type { AIContextItem } from "../registry";import { AIContextProvider } from "../registry";import { contextToXml } from "../utils";@@ -37,10 +42,12 @@ export interface DatasourceContextItem extends AIContextItem {};}+const CONTEXT_TYPE = "datasource";+export class DatasourceContextProvider extends AIContextProvider<DatasourceContextItem> {readonly title = "Datasource";readonly mentionPrefix = "@";- readonly contextType = "datasource";+ readonly contextType = CONTEXT_TYPE;private connectionsMap: ConnectionsMap;private dataframes: DataTable[];@@ -140,3 +147,20 @@ export class DatasourceContextProvider extends AIContextProvider<DatasourceConte};}}++export function getDatasourceContext(cellId: CellId): string | null {+ const cellData = store.get(cellDataAtom(cellId));+ const code = cellData?.code;+ if (!code || code.trim() === "") {+ return null;+ }++ const [_sqlStatement, _, metadata] = LanguageAdapters.sql.transformIn(code);+ const datasourceSchema = store+ .get(dataSourceConnectionsAtom)+ .connectionsMap.get(metadata.engine);+ if (datasourceSchema) {+ return `@${CONTEXT_TYPE}://${datasourceSchema.name}`;+ }+ return null;+}diff --git a/frontend/src/core/ai/state.ts b/frontend/src/core/ai/state.tsindex 008e2314a6..a23cf83c88 100644--- a/frontend/src/core/ai/state.ts+++ b/frontend/src/core/ai/state.ts@@ -13,10 +13,13 @@ const KEY = "marimo:ai:chatState:v5";export type ChatId = TypedString<"ChatId">;-export const aiCompletionCellAtom = atom<{+export interface AiCompletionCell {cellId: CellId;initialPrompt?: string;-} | null>(null);+ triggerImmediately?: boolean;+}++export const aiCompletionCellAtom = atom<AiCompletionCell | null>(null);const INCLUDE_OTHER_CELLS_KEY = "marimo:ai:includeOtherCells";export const includeOtherCellsAtom = atomWithStorage<boolean>(@@ -86,7 +89,7 @@ export const activeChatAtom = atom(}return state.chats.get(state.activeChatId);},- (get, set, chatId: ChatId | null) => {+ (_get, set, chatId: ChatId | null) => {set(chatStateAtom, (prev) => ({...prev,activeChatId: chatId,diff --git a/frontend/src/core/cells/cells.ts b/frontend/src/core/cells/cells.tsindex 4b7ebc2171..5fd8e220ba 100644--- a/frontend/src/core/cells/cells.ts+++ b/frontend/src/core/cells/cells.ts@@ -1615,7 +1615,7 @@ export const columnIdsAtom = atom((get) =>get(notebookAtom).cellIds.getColumnIds(),);-const cellDataAtom = atomFamily((cellId: CellId) =>+export const cellDataAtom = atomFamily((cellId: CellId) =>atom((get) => get(notebookAtom).cellData[cellId]),);const cellRuntimeAtom = atomFamily((cellId: CellId) =>diff --git a/frontend/src/core/errors/__tests__/errors.test.ts b/frontend/src/core/errors/__tests__/errors.test.tsindex 720bb8c86d..eeb1b7c405 100644--- a/frontend/src/core/errors/__tests__/errors.test.ts+++ b/frontend/src/core/errors/__tests__/errors.test.ts@@ -57,6 +57,7 @@ describe("getAutoFixes", () => {expect(fixes).toHaveLength(1);expect(fixes[0].title).toBe("Fix with AI");+ // No fixes without AIexpect(getAutoFixes(error, { aiEnabled: false })).toHaveLength(0);});diff --git a/frontend/src/core/errors/errors.ts b/frontend/src/core/errors/errors.tsindex 0cc30d1da8..4e7a67df40 100644--- a/frontend/src/core/errors/errors.ts+++ b/frontend/src/core/errors/errors.ts@@ -1,21 +1,26 @@/* Copyright 2024 Marimo. All rights reserved. */import type { EditorView } from "@codemirror/view";import { invariant } from "@/utils/invariant";+import { getDatasourceContext } from "../ai/context/providers/datasource";+import type { AiCompletionCell } from "../ai/state";import type { CellId } from "../cells/ids";import type { MarimoError } from "../kernel/messages";import { wrapInFunction } from "./utils";+interface AIFix {+ setAiCompletionCell: (opts: AiCompletionCell) => void;+ triggerFix: boolean;+}+export interface AutoFix {title: string;description: string;+ fixType: "manual" | "ai";onFix: (ctx: {addCodeBelow: (code: string) => void;editor: EditorView | undefined;cellId: CellId;- setAiCompletionCell?: (cell: {- cellId: CellId;- initialPrompt?: string;- }) => void;+ aiFix?: AIFix;}) => Promise<void>;}@@ -31,6 +36,7 @@ export function getAutoFixes(title: "Fix: Wrap in a function",description:"Make this cell's variables local by wrapping the cell in a function.",+ fixType: "manual",onFix: async (ctx) => {invariant(ctx.editor, "Editor is null");const code = wrapInFunction(ctx.editor.state.doc.toString());@@ -59,6 +65,7 @@ export function getAutoFixes({title: `Fix: Add '${cellCode}'`,description: "Add a new cell for the missing import",+ fixType: "manual",onFix: async (ctx) => {ctx.addCodeBelow(cellCode);},@@ -75,10 +82,17 @@ export function getAutoFixes({title: "Fix with AI",description: "Fix the SQL statement",+ fixType: "ai",onFix: async (ctx) => {- ctx.setAiCompletionCell?.({+ const datasourceContext = getDatasourceContext(ctx.cellId);+ let initialPrompt = `Fix the SQL statement: ${error.msg}.`;+ if (datasourceContext) {+ initialPrompt += `\nDatabase schema: ${datasourceContext}`;+ }+ ctx.aiFix?.setAiCompletionCell({cellId: ctx.cellId,- initialPrompt: `Fix the SQL statement: ${error.msg}`,+ initialPrompt: initialPrompt,+ triggerImmediately: ctx.aiFix.triggerFix,});},},