- {IS_PLATFORM && !isOptedInToAI && selectedOrganization && (
-
-
- )}
-
+
+ {IS_PLATFORM && !isOptedInToAI && selectedOrganization && (
+
+
+ Your organization does not allow sending anonymous data to OpenAI
+
+
+ This option is only available if your organization has opted-in to sending anonymous
+ data to OpenAI. You may configure your opt-in preferences through your organization's
+ settings.
+
+
+
+
+
+
+ )}
)
diff --git a/apps/studio/lib/constants/index.ts b/apps/studio/lib/constants/index.ts
index 7646cc7b481..1c6db8c8f77 100644
--- a/apps/studio/lib/constants/index.ts
+++ b/apps/studio/lib/constants/index.ts
@@ -29,14 +29,18 @@ export const USAGE_APPROACHING_THRESHOLD = 0.75
export const LOCAL_STORAGE_KEYS = {
RECENTLY_VISITED_ORGANIZATION: 'supabase-organization',
TELEMETRY_CONSENT: 'supabase-consent',
+
UI_PREVIEW_NAVIGATION_LAYOUT: 'supabase-ui-preview-nav-layout',
UI_PREVIEW_API_SIDE_PANEL: 'supabase-ui-api-side-panel',
UI_PREVIEW_RLS_AI_ASSISTANT: 'supabase-ui-rls-ai-assistant',
- DASHBOARD_HISTORY: (ref: string) => `dashboard-history-${ref}`,
UI_PREVIEW_CLS: 'supabase-ui-cls',
+ UI_PREVIEW_SQL_EDITOR_AI_ASSISTANT: 'supabase-ui-sql-editor-ai-assistant',
+
+ DASHBOARD_HISTORY: (ref: string) => `dashboard-history-${ref}`,
SQL_EDITOR_INTELLISENSE: 'supabase_sql-editor-intellisense-enabled',
SQL_EDITOR_SPLIT_SIZE: 'supabase_sql-editor-split-size',
+ SQL_EDITOR_AI_SCHEMA: 'supabase_sql-editor-ai-schema-enabled',
LOG_EXPLORER_SPLIT_SIZE: 'supabase_log-explorer-split-size',
GRAPHIQL_RLS_BYPASS_WARNING: 'graphiql-rls-bypass-warning-dismissed',
CLS_DIFF_WARNING: 'cls-diff-warning-dismissed',
diff --git a/apps/studio/pages/api/ai/sql/generate-v2.ts b/apps/studio/pages/api/ai/sql/generate-v2.ts
new file mode 100644
index 00000000000..144f01a93bd
--- /dev/null
+++ b/apps/studio/pages/api/ai/sql/generate-v2.ts
@@ -0,0 +1,70 @@
+import { StreamingTextResponse } from 'ai'
+import { generateV2 } from 'ai-commands/edge'
+import { NextRequest } from 'next/server'
+import OpenAI from 'openai'
+
+export const runtime = 'edge'
+
+const openAiKey = process.env.OPENAI_KEY
+
+export default async function handler(req: NextRequest) {
+ if (!openAiKey) {
+ return new Response(
+ JSON.stringify({
+ error: 'No OPENAI_KEY set. Create this environment variable to use AI features.',
+ }),
+ {
+ status: 500,
+ headers: { 'Content-Type': 'application/json' },
+ }
+ )
+ }
+
+ const { method } = req
+
+ switch (method) {
+ case 'POST':
+ return handlePost(req)
+ default:
+ return new Response(
+ JSON.stringify({ data: null, error: { message: `Method ${method} Not Allowed` } }),
+ {
+ status: 405,
+ headers: { 'Content-Type': 'application/json', Allow: 'POST' },
+ }
+ )
+ }
+}
+
+async function handlePost(request: NextRequest) {
+ const openai = new OpenAI({ apiKey: openAiKey })
+
+ const body = await (request.json() as Promise<{
+ messages: { content: string; role: 'user' | 'assistant' }[]
+ existingSql?: string
+ entityDefinitions: string[]
+ }>)
+
+ const { messages, existingSql, entityDefinitions } = body
+
+ try {
+ const stream = await generateV2(openai, messages, existingSql, entityDefinitions)
+ return new StreamingTextResponse(stream)
+ } catch (error) {
+ if (error instanceof Error) {
+ console.error(`AI SQL generation-v2 failed: ${error.message}`)
+ } else {
+ console.error(`AI SQL generation-v2 failed: ${error}`)
+ }
+
+ return new Response(
+ JSON.stringify({
+ error: 'There was an error processing your request',
+ }),
+ {
+ status: 500,
+ headers: { 'Content-Type': 'application/json' },
+ }
+ )
+ }
+}
diff --git a/apps/studio/pages/project/[ref]/sql/[id].tsx b/apps/studio/pages/project/[ref]/sql/[id].tsx
index accfced29d6..57c26080ae9 100644
--- a/apps/studio/pages/project/[ref]/sql/[id].tsx
+++ b/apps/studio/pages/project/[ref]/sql/[id].tsx
@@ -150,7 +150,7 @@ const SqlEditor: NextPageWithLayout = () => {
}, [isPgInfoReady])
return (
-
+
)
diff --git a/packages/ai-commands/src/sql.edge.ts b/packages/ai-commands/src/sql.edge.ts
index dad7514d62f..fb5164e9bc2 100644
--- a/packages/ai-commands/src/sql.edge.ts
+++ b/packages/ai-commands/src/sql.edge.ts
@@ -94,6 +94,77 @@ export async function chatRlsPolicy(
}
}
+/**
+ * Responds to a conversation about writing a SQL query.
+ *
+ * @returns A `ReadableStream` containing the response text and SQL.
+ */
+export async function generateV2(
+ openai: OpenAI,
+ messages: Message[],
+ existingSql?: string,
+ entityDefinitions?: string[]
+): Promise
> {
+ const initMessages: OpenAI.Chat.Completions.ChatCompletionMessageParam[] = [
+ {
+ role: 'system',
+ content: stripIndent`
+ The generated SQL (must be valid SQL).
+ - For primary keys, always use "id bigint primary key generated always as identity" (not serial)
+ - Prefer creating foreign key references in the create statement
+ - Prefer 'text' over 'varchar'
+ - Prefer 'timestamp with time zone' over 'date'
+ - Use vector(384) data type for any embedding/vector related query
+ - Always use double apostrophe in SQL strings (eg. 'Night''s watch')
+ - Always use semicolons
+ - Output as markdown
+ - Always include code snippets if available
+ `,
+ },
+ ]
+
+ if (entityDefinitions) {
+ const definitions = codeBlock`${entityDefinitions.join('\n\n')}`
+ initMessages.push({
+ role: 'user',
+ content: oneLine`Here is my database schema for reference: ${definitions}`,
+ })
+ }
+
+ if (existingSql !== undefined && existingSql.length > 0) {
+ const sqlBlock = codeBlock`${existingSql}`
+ initMessages.push({
+ role: 'user',
+ content: codeBlock`
+ Here is the existing SQL I wrote for reference:
+ ${sqlBlock}
+ `.trim(),
+ })
+ }
+
+ if (messages) {
+ initMessages.push(...messages)
+ }
+
+ try {
+ const response = await openai.chat.completions.create({
+ model: 'gpt-3.5-turbo-0125',
+ messages: initMessages,
+ max_tokens: 1024,
+ temperature: 0,
+ stream: true,
+ })
+
+ // Transform the streamed SSE response from OpenAI to a ReadableStream
+ return OpenAIStream(response)
+ } catch (error) {
+ if (error instanceof Error && 'code' in error && error.code === 'context_length_exceeded') {
+ throw new ContextLengthError()
+ }
+ throw error
+ }
+}
+
export async function clippy(
openai: OpenAI,
supabaseClient: SupabaseClient,