The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Stop re-deriving notebook update diffs after completion (#49399)
Charis27ff49c1458b
diff --git a/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.test.tsx b/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.test.tsxindex d070b905c83..f48bef2b8c7 100644--- a/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.test.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.test.tsx@@ -1,4 +1,4 @@-import { screen } from '@testing-library/react'+import { screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { HttpResponse } from 'msw'import { describe, expect, it, vi } from 'vitest'@@ -255,13 +255,73 @@ describe('NotebookProposalRenderer', () => {)})- it('shows the notebook action after an automatic update succeeds', async () => {- mockContentItem(mockNotebookRow())+ it('shows the notebook action after an automatic update succeeds', () => {+ render(+ <NotebookProposalRenderer+ mode="update"+ state="output-available"+ input={{+ id: NOTEBOOK_ID,+ expected_updated_at: '2024-01-01T00:00:00.000Z',+ operations: [{ _tag: 'delete_cell', cell_id: 'cell-1' }],+ }}+ output={{ id: NOTEBOOK_ID, name: 'Signup funnel' }}+ />+ )++ expect(screen.getByRole('link', { name: 'Open notebook' })).toHaveAttribute(+ 'href',+ `/project/default/explorer/notebook/${NOTEBOOK_ID}`+ )+ })++ it('does not show the "can\'t be applied" warning for a completed update whose target cell no longer exists', async () => {+ mockContentItem(+ mockNotebookRow({+ content: {+ schema_version: 1,+ cells: [{ _tag: 'markdown_cell', _id: 'cell-2', text: 'world' }],+ },+ })+ )++ render(+ <NotebookProposalRenderer+ mode="update"+ state="output-available"+ input={{+ id: NOTEBOOK_ID,+ expected_updated_at: '2024-01-01T00:00:00.000Z',+ operations: [{ _tag: 'delete_cell', cell_id: 'cell-1' }],+ }}+ output={{ id: NOTEBOOK_ID, name: 'Signup funnel' }}+ />+ )++ await waitFor(() => expect(screen.queryByText('Loading notebook...')).not.toBeInTheDocument())+ expect(screen.queryByText("This update can't be applied as written")).not.toBeInTheDocument()+ expect(screen.getByRole('link', { name: 'Open notebook' })).toBeInTheDocument()+ expect(screen.getByRole('link', { name: 'Open notebook' })).toHaveAttribute(+ 'href',+ `/project/default/explorer/notebook/${NOTEBOOK_ID}`+ )+ })++ it('shows the notebook action inside the Confirm footer for a manually approved completed update', async () => {+ mockContentItem(+ mockNotebookRow({+ content: {+ schema_version: 1,+ cells: [{ _tag: 'markdown_cell', _id: 'cell-2', text: 'world' }],+ },+ })+ )render(<NotebookProposalRenderermode="update"state="output-available"+ confirmState="success"input={{id: NOTEBOOK_ID,expected_updated_at: '2024-01-01T00:00:00.000Z',@@ -271,10 +331,52 @@ describe('NotebookProposalRenderer', () => {/>)- expect(await screen.findByRole('link', { name: 'Open notebook' })).toHaveAttribute(+ const openNotebookLink = await screen.findByRole('link', { name: 'Open notebook' })+ expect(openNotebookLink).toHaveAttribute('href',`/project/default/explorer/notebook/${NOTEBOOK_ID}`)+ expect(screen.queryByText("This update can't be applied as written")).not.toBeInTheDocument()+ })++ it('derives the diff against live content for a denied update', async () => {+ mockContentItem(mockNotebookRow())++ render(+ <NotebookProposalRenderer+ mode="update"+ state="output-denied"+ confirmState="denied"+ input={{+ id: NOTEBOOK_ID,+ expected_updated_at: '2024-01-01T00:00:00.000Z',+ operations: [{ _tag: 'delete_cell', cell_id: 'cell-1' }],+ }}+ output={undefined}+ />+ )++ expect(await screen.findByText('−1')).toBeInTheDocument()+ })++ it('derives the diff against live content for an errored update', async () => {+ mockContentItem(mockNotebookRow())++ render(+ <NotebookProposalRenderer+ mode="update"+ state="output-error"+ confirmState="error"+ input={{+ id: NOTEBOOK_ID,+ expected_updated_at: '2024-01-01T00:00:00.000Z',+ operations: [{ _tag: 'delete_cell', cell_id: 'cell-1' }],+ }}+ output={undefined}+ />+ )++ expect(await screen.findByText('−1')).toBeInTheDocument()})it('keeps the create preview and marks it failed when the tool errors', () => {diff --git a/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.tsx b/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.tsxindex 3456310b2c3..d2634c6a948 100644--- a/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.tsx+++ b/apps/studio/components/ui/AIAssistantPanel/NotebookProposalRenderer.tsx@@ -100,6 +100,8 @@ export const NotebookProposalRenderer = (props: NotebookProposalRendererProps) =) : (<UpdateNotebookProposalinput={input}+ state={state}+ output={output}confirmState={confirmState}footerAction={confirmState === undefined ? undefined : footerAction}onApprove={onApprove}@@ -234,23 +236,33 @@ function CreateNotebookProposal({)}+const TERMINAL_CONFIRM_STATES: ConfirmFooterApprovalState[] = ['success', 'error', 'denied']+/**- * An update whose operations don't apply to the notebook as currently loaded (e.g. an- * operation targets a cell id that no longer exists). There's nothing for the user to decide- * here, so instead of asking them to Skip, deny automatically with the specific reason —- * same text `update_notebook`'s server-side execute() would throw for the same failure — so- * the model sees why and can retry (e.g. re-fetch and reissue) without the user's involvement.+ * An update whose operations don't apply to the notebook as currently loaded+ * (e.g. an operation targets a cell id that no longer exists). There's nothing+ * for the user to decide here, so instead of asking them to Skip, deny+ * automatically with the specific reason — same text `update_notebook`'s+ * server-side execute() would throw for the same failure — so the model sees+ * why and can retry (e.g. re-fetch and reissue) without the user's involvement.+ *+ * For a terminal `confirmState` (the decision already happened), re-deriving+ * against live content is just for display, and "can't be applied as written"+ * is inaccurate — nothing is being applied anymore. Instead, state that the+ * notebook has changed since, so the preview can't be reconstructed.*/function UnapplyableNotebookUpdateNotice({notebookName,reason,confirmState,+ footerAction,onDeny,denyWithReason,}: {notebookName: stringreason: stringconfirmState?: ConfirmFooterApprovalState+ footerAction?: ReactNodeonDeny?: () => voiddenyWithReason?: (reason: string) => void}) {@@ -262,20 +274,31 @@ function UnapplyableNotebookUpdateNotice({if (confirmState === 'approval-requested') onUnapplyable()}, [confirmState])+ const isTerminal = confirmState !== undefined && TERMINAL_CONFIRM_STATES.includes(confirmState)+return (<NotebookConfirmmode="update"confirmState={confirmState}+ footerAction={footerAction}message={`Assistant wants to update "${notebookName}"`}denyOnlyonDeny={() => (denyWithReason ? denyWithReason(reason) : onDeny?.())}><div className="p-3">- <Admonition- type="warning"- title="This update can't be applied as written"- description={reason}- />+ {isTerminal ? (+ <Admonition+ type="warning"+ title="Preview unavailable"+ description="This notebook has changed since, so the preview can't be reconstructed."+ />+ ) : (+ <Admonition+ type="warning"+ title="This update can't be applied as written"+ description={reason}+ />+ )}</div></NotebookConfirm>)@@ -283,14 +306,17 @@ function UnapplyableNotebookUpdateNotice({function UpdateNotebookProposal({input,+ state,+ output,confirmState,footerAction,onApprove,onDeny,denyWithReason,-}: NotebookProposalStepProps) {+}: NotebookProposalStepProps & { state: NotebookProposalState; output: unknown }) {const { ref } = useParams()const parsedInput = updateNotebookInputSchema.safeParse(input)+ const isCompleted = state === 'output-available'const {data: notebook,@@ -299,7 +325,7 @@ function UpdateNotebookProposal({error,} = useNotebookQuery({ projectRef: ref, id: parsedInput.success ? parsedInput.data.id : undefined },- { enabled: parsedInput.success }+ { enabled: parsedInput.success && !isCompleted })if (!parsedInput.success) {@@ -313,6 +339,25 @@ function UpdateNotebookProposal({)}+ if (isCompleted) {+ const parsedOutput = notebookToolOutputSchema.safeParse(output)+ const notebookName = parsedOutput.success ? parsedOutput.data.name : undefined++ return (+ <NotebookConfirm+ mode="update"+ confirmState={confirmState}+ footerAction={footerAction}+ onApprove={onApprove}+ onDeny={onDeny}+ >+ <div className="p-3 text-sm text-foreground-light truncate">+ {notebookName ? `Notebook updated: ${notebookName}` : MODE_COPY.update.outputLabel}+ </div>+ </NotebookConfirm>+ )+ }+if (isLoading) {return (<div className="my-4 mx-4 rounded-lg border bg-surface-75 heading-meta h-9 px-3 text-foreground-light flex items-center gap-2">@@ -349,6 +394,7 @@ function UpdateNotebookProposal({notebookName={notebook.name}reason={describeNotebookOperationError(diff.error)}confirmState={confirmState}+ footerAction={footerAction}onDeny={onDeny}denyWithReason={denyWithReason}/>