mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 02:15:05 +03:00
## Summary
- **Removed dead client-side refresh UI** in
`NotebookProposalRenderer.tsx` and its test — the diff preview is always
computed from live data, so the check was redundant with the tool's
server-side re-validation
- **Added typed `NotebookToolError`** in `notebook-tools.ts` with
structured metadata (`{ exposeToAssistant: boolean }`) validated by a
zod schema with a literal discriminant tag (`tag:
'notebook_tool_error'`) — tracks the two retryable failures: staleness
conflict and invalid operations (unknown cell id)
- **Encoded errors in `generate-v4.ts` onError** — the one place in the
pipeline that holds the live `Error` before it becomes a string in the
persisted message
- **Extracted and fixed message history filter** into new
`generate-assistant-response.utils.ts` — any tool-error whose
`errorText` decodes against the `NotebookToolError` schema is let
through (with `errorText` rewritten to plain prose so the model sees the
message, not JSON), while other errors stay filtered as before
Net effect: the assistant detects the specific, actionable rejection
reason and retries on its own with no dead button or human intervention
needed.
## Test plan
- Existing unit tests in `NotebookProposalRenderer.test.tsx` pass (dead
button test removed)
- New unit tests in `notebook-tools.test.ts` cover encode/decode
round-trips and error discrimination
- New unit tests in `generate-assistant-response.utils.test.ts` cover
message history filtering with all error states
- `pnpm typecheck` is clean
- `pnpm --filter studio run lint:ratchet` passes (no new ESLint
warnings)
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **New Features**
* Notebook update errors now provide clearer, structured explanations to
the AI assistant.
* Assistant responses preserve relevant notebook error details while
filtering invalid or temporary tool states.
* **Bug Fixes**
* Improved handling of stale notebook revisions and invalid notebook
update operations.
* Notebook proposal rendering proceeds without an unnecessary refresh
step.
* **Tests**
* Expanded coverage for notebook errors, message filtering,
serialization, and error handling.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
286 lines
8.3 KiB
TypeScript
286 lines
8.3 KiB
TypeScript
import pgMeta from '@supabase/pg-meta'
|
|
import type { JwtPayload } from '@supabase/supabase-js'
|
|
import { pipeUIMessageStreamToResponse, safeValidateUIMessages, toUIMessageStream } from 'ai'
|
|
import { IS_PLATFORM } from 'common'
|
|
import type { NextApiRequest, NextApiResponse } from 'next'
|
|
import z from 'zod'
|
|
|
|
import { executeSql } from '@/data/sql/execute-sql-mutation'
|
|
import type { AiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi'
|
|
import { getAIDetails } from '@/lib/ai/ai-details'
|
|
import { NO_SCHEMA_ACCESS_MESSAGE } from '@/lib/ai/assistant-context'
|
|
import {
|
|
assistantMessageMetadataSchema,
|
|
messagesIncludeLogsSnippets,
|
|
} from '@/lib/ai/assistant-message-metadata'
|
|
import { isTracingAllowed } from '@/lib/ai/braintrust-logger'
|
|
import { generateAssistantResponse } from '@/lib/ai/generate-assistant-response'
|
|
import { isExplorerEnabled } from '@/lib/ai/is-explorer-enabled'
|
|
import { getModel } from '@/lib/ai/model'
|
|
import {
|
|
DEFAULT_ASSISTANT_ADVANCE_MODEL_ID,
|
|
DEFAULT_ASSISTANT_BASE_MODEL_ID,
|
|
getAssistantModelEntry,
|
|
isAssistantBaseModelId,
|
|
isKnownAssistantModelId,
|
|
type AssistantModelId,
|
|
} from '@/lib/ai/model.utils'
|
|
import { getTools } from '@/lib/ai/tools'
|
|
import { encodeNotebookToolError } from '@/lib/ai/tools/notebook-tools'
|
|
import { apiWrapper } from '@/lib/api/apiWrapper'
|
|
import { executeQuery } from '@/lib/api/self-hosted/query'
|
|
import { getURL } from '@/lib/helpers'
|
|
import { trustedUserEmail } from '@/lib/server/configcat'
|
|
|
|
export const maxDuration = 120
|
|
|
|
export const config = {
|
|
api: {
|
|
bodyParser: {
|
|
sizeLimit: '5mb',
|
|
},
|
|
},
|
|
}
|
|
|
|
async function handler(req: NextApiRequest, res: NextApiResponse, claims?: JwtPayload) {
|
|
const { method } = req
|
|
|
|
switch (method) {
|
|
case 'POST':
|
|
return handlePost(req, res, claims)
|
|
default:
|
|
res.setHeader('Allow', ['POST'])
|
|
res.status(405).json({
|
|
data: null,
|
|
error: { message: `Method ${method} Not Allowed` },
|
|
})
|
|
}
|
|
}
|
|
|
|
const wrapper = (req: NextApiRequest, res: NextApiResponse) =>
|
|
apiWrapper(req, res, handler, { withAuth: true })
|
|
|
|
export default wrapper
|
|
|
|
const requestBodySchema = z.object({
|
|
messages: z.array(z.any()),
|
|
projectRef: z.string(),
|
|
connectionString: z.string(),
|
|
schema: z.string().optional(),
|
|
table: z.string().optional(),
|
|
chatId: z.string().optional(),
|
|
chatName: z.string().optional(),
|
|
supportMode: z.boolean().optional(),
|
|
orgSlug: z.string().optional(),
|
|
model: z.string().optional(),
|
|
})
|
|
|
|
async function handlePost(req: NextApiRequest, res: NextApiResponse, claims?: JwtPayload) {
|
|
const authorization = req.headers.authorization
|
|
const accessToken = authorization?.replace('Bearer ', '')
|
|
|
|
if (IS_PLATFORM && !accessToken) {
|
|
return res.status(401).json({ error: 'Authorization token is required' })
|
|
}
|
|
|
|
const userId = claims?.sub
|
|
|
|
const body = typeof req.body === 'string' ? JSON.parse(req.body) : req.body
|
|
const { data, error: parseError } = requestBodySchema.safeParse(body)
|
|
|
|
if (parseError) {
|
|
return res.status(400).json({ error: 'Invalid request body', issues: parseError.issues })
|
|
}
|
|
|
|
const {
|
|
messages: rawMessages,
|
|
projectRef,
|
|
connectionString,
|
|
orgSlug,
|
|
chatId,
|
|
chatName,
|
|
model: rawRequestedModel,
|
|
supportMode,
|
|
} = data
|
|
|
|
const requestedModel: AssistantModelId | undefined =
|
|
rawRequestedModel && isKnownAssistantModelId(rawRequestedModel) ? rawRequestedModel : undefined
|
|
|
|
const messagesValidation = await safeValidateUIMessages({
|
|
messages: rawMessages,
|
|
metadataSchema: assistantMessageMetadataSchema,
|
|
})
|
|
if (!messagesValidation.success) {
|
|
return res.status(400).json({
|
|
error: 'Invalid request body',
|
|
message: messagesValidation.error.message,
|
|
})
|
|
}
|
|
const messages = messagesValidation.data
|
|
|
|
const includesLogsSnippets = messagesIncludeLogsSnippets(messages)
|
|
|
|
let aiOptInLevel: AiOptInLevel = 'disabled'
|
|
let hasAccessToAdvanceModel = false
|
|
let orgHasHipaaAddon: boolean | undefined
|
|
let projectIsSensitive: boolean | null | undefined
|
|
let projectRegion: string | undefined
|
|
let orgId: number | undefined
|
|
let planId: string | undefined
|
|
|
|
if (!IS_PLATFORM) {
|
|
aiOptInLevel = 'schema'
|
|
hasAccessToAdvanceModel = true
|
|
}
|
|
|
|
if (IS_PLATFORM && orgSlug && authorization && projectRef) {
|
|
try {
|
|
const aiDetails = await getAIDetails({ orgSlug, projectRef, authorization })
|
|
|
|
aiOptInLevel = aiDetails.aiOptInLevel
|
|
hasAccessToAdvanceModel = aiDetails.hasAccessToAdvanceModel
|
|
orgHasHipaaAddon = aiDetails.hasHipaaAddon
|
|
orgId = aiDetails.orgId
|
|
planId = aiDetails.planId
|
|
projectIsSensitive = aiDetails.isSensitive
|
|
projectRegion = aiDetails.region
|
|
} catch (error) {
|
|
return res.status(400).json({
|
|
error: 'There was an error fetching your organization details',
|
|
})
|
|
}
|
|
}
|
|
|
|
const explorerEnabled = await isExplorerEnabled(trustedUserEmail(claims?.email))
|
|
|
|
const envThrottled = process.env.IS_THROTTLED !== 'false'
|
|
|
|
let effectiveModel: AssistantModelId = requestedModel ?? DEFAULT_ASSISTANT_ADVANCE_MODEL_ID
|
|
if (!hasAccessToAdvanceModel || (envThrottled && !isAssistantBaseModelId(effectiveModel))) {
|
|
effectiveModel = DEFAULT_ASSISTANT_BASE_MODEL_ID
|
|
}
|
|
|
|
const {
|
|
modelParams,
|
|
error: modelError,
|
|
systemProviderOptions,
|
|
} = await getModel({
|
|
provider: 'openai',
|
|
modelEntry: getAssistantModelEntry(effectiveModel),
|
|
})
|
|
|
|
if (modelError) {
|
|
return res.status(500).json({ error: modelError.message })
|
|
}
|
|
|
|
try {
|
|
const abortController = new AbortController()
|
|
req.on('close', () => abortController.abort())
|
|
req.on('aborted', () => abortController.abort())
|
|
// Fires when the response finishes streaming or the connection drops, which
|
|
// is what tears down the remote MCP connection opened in getTools.
|
|
res.on('close', () => abortController.abort())
|
|
|
|
const tools = await getTools({
|
|
projectRef,
|
|
connectionString,
|
|
authorization,
|
|
aiOptInLevel,
|
|
accessToken,
|
|
baseUrl: getURL(),
|
|
supportMode,
|
|
isExplorerEnabled: explorerEnabled,
|
|
signal: abortController.signal,
|
|
})
|
|
|
|
// Get a list of all schemas to add to context
|
|
const getSchemas = async (): Promise<string> => {
|
|
const pgMetaSchemasList = pgMeta.schemas.list()
|
|
type Schemas = z.infer<(typeof pgMetaSchemasList)['zod']>
|
|
|
|
const { result: schemas } = await executeSql<Schemas>(
|
|
{
|
|
projectRef,
|
|
connectionString,
|
|
sql: pgMetaSchemasList.sql,
|
|
},
|
|
undefined,
|
|
{
|
|
'Content-Type': 'application/json',
|
|
...(authorization && { Authorization: authorization }),
|
|
},
|
|
IS_PLATFORM ? undefined : executeQuery
|
|
)
|
|
|
|
return schemas?.length > 0
|
|
? `The available database schema names are: ${JSON.stringify(schemas)}`
|
|
: NO_SCHEMA_ACCESS_MESSAGE
|
|
}
|
|
|
|
const result = await generateAssistantResponse({
|
|
messages,
|
|
...modelParams,
|
|
tools,
|
|
aiOptInLevel,
|
|
getSchemas: aiOptInLevel !== 'disabled' ? getSchemas : undefined,
|
|
projectRef,
|
|
chatId,
|
|
chatName,
|
|
allowTracing: isTracingAllowed({
|
|
orgHasHipaaAddon,
|
|
projectIsSensitive,
|
|
projectRegion,
|
|
}),
|
|
supportMode,
|
|
userId,
|
|
orgId,
|
|
planId,
|
|
includesLogsSnippets,
|
|
isExplorerEnabled: explorerEnabled,
|
|
requestedModel,
|
|
systemProviderOptions,
|
|
abortSignal: abortController.signal,
|
|
onSpanCreated: (spanId) => {
|
|
res.setHeader('x-braintrust-span-id', spanId)
|
|
},
|
|
})
|
|
|
|
const stream = toUIMessageStream({
|
|
stream: result.stream,
|
|
sendReasoning: true,
|
|
onError: (error) => {
|
|
console.error('Assistant stream error:', error)
|
|
|
|
const encoded = encodeNotebookToolError(error)
|
|
if (encoded !== null) return encoded
|
|
|
|
if (error == null) {
|
|
return 'unknown error'
|
|
}
|
|
|
|
if (typeof error === 'string') {
|
|
return error
|
|
}
|
|
|
|
if (error instanceof Error) {
|
|
return error.message
|
|
}
|
|
|
|
return JSON.stringify(error)
|
|
},
|
|
})
|
|
|
|
pipeUIMessageStreamToResponse({
|
|
response: res,
|
|
stream,
|
|
headers: { 'Content-Encoding': 'none' },
|
|
})
|
|
} catch (error) {
|
|
console.error('Error in handlePost:', error)
|
|
if (error instanceof Error) {
|
|
return res.status(500).json({ message: error.message })
|
|
}
|
|
return res.status(500).json({ message: 'An unexpected error occurred.' })
|
|
}
|
|
}
|