mirror of
https://github.com/supabase/supabase.git
synced 2026-10-06 09:55:06 +03:00
Charis
21511042a3
## I have read the [CONTRIBUTING.md](https://github.com/supabase/supabase/blob/master/CONTRIBUTING.md) file. YES ## What kind of change does this PR introduce? Feature — final PR (9/9) of the SQL editor logs-source stack. **Base branch:** `charislam/sql-editor-inline-ai-clickhouse-dialect` (PR 8). Nothing here is user-visible: entry points stay behind `sqlEditorLogsSource` + `otelLegacyLogs`, and flag rollout happens after the whole stack merges. ## What is the current behavior? - The Assistant has no idea a SQL editor snippet targets the logs backend. Ask it about a logs snippet and it answers in Postgres, because the attached query is fenced as ` ```sql ` and nothing tells the model otherwise. - Because the `sql` fence is what `MessageMarkdown` treats as runnable Postgres, an attached ClickHouse query is rendered with a Run-against-Postgres affordance and branded with `untrustedSql`. - "Debug with Assistant" on a failed logs query produces a dialect-less prompt, so both the in-app assistant and the copyable version get debugged as Postgres. - A report referencing a `log_sql` snippet runs its ClickHouse SQL against the user's Postgres database and surfaces the resulting error. ## What is the new behavior? **Assistant panel.** The "Current Query" chip records which backend the attached query targets. That reaches the model two ways: each attachment is fenced with its own dialect (` ```clickhouse ` vs ` ```sql `), and a `containsLogsSnippets` flag rides on the user message as AI SDK `metadata`. The server reads the flag off the conversation and prepends the ClickHouse dialect rules plus the logs schema reference as a non-cached context message. Two design points worth calling out in review: - The flag lives on the **message**, not the request body, so Retry and the tool-approval continuation reproduce the context a message was originally asked in — neither of those passes a per-call body. - It's derived from **what's actually attached**, so detaching the chip drops the claim rather than leaving the two able to disagree. The `clickhouse` fence also keeps a logs query out of `MessageMarkdown`'s `sql` branch, so it's no longer offered as runnable Postgres or branded with `untrustedSql` — a boundary this stack's distinct brands exist to prevent crossing. **Debug flow.** `buildDebugChatArgs` attaches its query with a source for the same reason, and names the dialect in the prompt text so the copyable version stands on its own outside the app. **Reports.** A report only stores a snippet id, so whether it queries the logs backend is only knowable once the content loads. `ReportBlock` guards on the fetched type and renders a `LogsSnippetReportBlock` placeholder instead of executing. Double-guarded: no `sql` for a logs snippet (so it's out of the query key and `queryFn` short-circuits even on an explicit `refetch`) and `enabled` excludes it. **Incidental cleanups.** `buildAssistantContextMessages` extracted out of `generate-assistant-response`; a schema-access sentinel that was duplicated as a string literal across two files (and compared against) replaced with one exported constant; `SqlSnippet` deduplicated to a single declaration; `resolveSnippetSource` / `isLogsSource` shared instead of re-implemented per surface. **Tests.** 4 new/extended suites. Notable cases pinned: a message with no metadata must validate (`safeValidateUIMessages` applies `metadataSchema` to *every* message, so a required schema would 400 every existing conversation); only *user* messages count, so a model reply can't talk the server into a different dialect; a mixed-attachment message is flagged without overclaiming a single source; and `ReportBlock` registers no pg-meta mock for the logs cases, so an unhandled request failing the test *is* the assertion that logs SQL never reaches Postgres. Verified: `pnpm typecheck`, `lint:ratchet` (no regression), Prettier, and the full Studio suite (459 files / 4969 tests). ## Additional context <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Added support for recognizing log snippets in reports, with clear guidance to open them in the SQL editor or remove them. - AI Assistant now understands log snippets and provides ClickHouse-specific context, formatting, and troubleshooting guidance. - Snippets retain their source information when shared with the AI Assistant. - **Bug Fixes** - Prevented unsupported log snippets from being executed as regular database queries. - Improved source detection when opening snippets directly from links. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
61 lines
1.9 KiB
TypeScript
61 lines
1.9 KiB
TypeScript
import { X } from 'lucide-react'
|
|
import React from 'react'
|
|
import { Button, HoverCard, HoverCardContent, HoverCardTrigger } from 'ui'
|
|
import { CodeBlock } from 'ui-patterns/CodeBlock'
|
|
|
|
import { getSnippetContent, getSnippetLabel } from './AIAssistant.utils'
|
|
import { type SqlSnippet } from '@/state/ai-assistant-state'
|
|
|
|
interface SnippetRowProps {
|
|
snippets: SqlSnippet[]
|
|
onRemoveSnippet?: (index: number) => void
|
|
className?: string
|
|
}
|
|
|
|
export const SnippetRow: React.FC<SnippetRowProps> = ({
|
|
snippets,
|
|
onRemoveSnippet,
|
|
className = '',
|
|
}) => {
|
|
if (!snippets || snippets.length === 0) return null
|
|
|
|
return (
|
|
<div className={`w-full overflow-x-auto flex ${className}`}>
|
|
{snippets.map((snippet, idx) => (
|
|
<HoverCard key={idx}>
|
|
<HoverCardTrigger asChild>
|
|
<div
|
|
tabIndex={0}
|
|
className="border bg inline-flex gap-1 items-center shrink-0 py-1 pl-2 rounded-full pr-1 text-xs cursor-pointer"
|
|
>
|
|
{getSnippetLabel(snippet, idx)}
|
|
{onRemoveSnippet && (
|
|
<Button
|
|
size="tiny"
|
|
variant="text"
|
|
className="h-4! w-4! rounded-full p-0"
|
|
onClick={(e) => {
|
|
e.stopPropagation()
|
|
onRemoveSnippet(idx)
|
|
}}
|
|
aria-label={`Remove snippet ${idx + 1}`}
|
|
icon={<X strokeWidth={1.5} className="h-3! w-3!" />}
|
|
/>
|
|
)}
|
|
</div>
|
|
</HoverCardTrigger>
|
|
<HoverCardContent className="w-96 max-h-64 overflow-auto p-0">
|
|
<CodeBlock
|
|
hideLineNumbers
|
|
className="text-xs font-mono whitespace-pre-wrap wrap-break-word p-2 border-0"
|
|
language="sql"
|
|
>
|
|
{getSnippetContent(snippet)}
|
|
</CodeBlock>
|
|
</HoverCardContent>
|
|
</HoverCard>
|
|
))}
|
|
</div>
|
|
)
|
|
}
|