Merge branch 'main' into feat/pg_dump-in-the-browser

Author: jgoux

README.md

@@ -23,7 +23,7 @@ How is this possible? [PGlite](https://pglite.dev/), a WASM version of Postgres
 
 This is a monorepo split into the following projects:
 
-- [Web](./apps/postgres-new/): The primary web app built with Next.js
+- [Web](./apps/web/): The primary web app built with Next.js
 - [Browser proxy](./apps/browser-proxy/): Proxies Postgres TCP connections back to the browser using [pg-gateway](https://github.com/supabase-community/pg-gateway) and Web Sockets
 - [Deploy worker](./apps/deploy-worker/): Deploys in-browser databases to database platforms (currently Supabase is supported)
 
@@ -41,33 +41,33 @@ From the monorepo root:
    ```shell
    npx supabase start
    ```
-3. Store local Supabase URL/anon key in `./apps/postgres-new/.env.local`:
+3. Store local Supabase URL/anon key in `./apps/web/.env.local`:
    ```shell
    npx supabase status -o env \
      --override-name api.url=NEXT_PUBLIC_SUPABASE_URL \
      --override-name auth.anon_key=NEXT_PUBLIC_SUPABASE_ANON_KEY |
-       grep NEXT_PUBLIC >> ./apps/postgres-new/.env.local
+       grep NEXT_PUBLIC >> ./apps/web/.env.local
    ```
-4. Create an [OpenAI API key](https://platform.openai.com/api-keys) and save to `./apps/postgres-new/.env.local`:
+4. Create an [OpenAI API key](https://platform.openai.com/api-keys) and save to `./apps/web/.env.local`:
    ```shell
-   echo 'OPENAI_API_KEY="<openai-api-key>"' >> ./apps/postgres-new/.env.local
+   echo 'OPENAI_API_KEY="<openai-api-key>"' >> ./apps/web/.env.local
    ```
 5. Store local KV (Redis) vars. Use these exact values:
 
    ```shell
-   echo 'KV_REST_API_URL="http://localhost:8080"' >> ./apps/postgres-new/.env.local
-   echo 'KV_REST_API_TOKEN="local_token"' >> ./apps/postgres-new/.env.local
+   echo 'KV_REST_API_URL="http://localhost:8080"' >> ./apps/web/.env.local
+   echo 'KV_REST_API_TOKEN="local_token"' >> ./apps/web/.env.local
    ```
 
 6. Start local Redis containers (used for rate limiting). Serves an API on port 8080:
 
    ```shell
-   docker compose -f ./apps/postgres-new/docker-compose.yml up -d
+   docker compose -f ./apps/web/docker-compose.yml up -d
    ```
 
 7. Fill in the remaining variables for each app as seen in:
 
-   - `./apps/postgres-new/.env.example`
+   - `./apps/web/.env.example`
    - `./apps/browser-proxy/.env.example`
    - `./apps/deploy-worker/.env.example`
 

apps/postgres-new/.env.example renamed to apps/web/.env.example

@@ -0,0 +1 @@
+public/sw.mjs

apps/web/.gitignore

@@ -1,4 +1,4 @@
-# postgres-new
+# @database.build/web
 
 In-browser Postgres sandbox with AI assistance. Built on Next.js.
 

apps/postgres-new/README.md renamed to apps/web/README.md

@@ -2,8 +2,8 @@ import { createOpenAI } from '@ai-sdk/openai'
 import { Ratelimit } from '@upstash/ratelimit'
 import { kv } from '@vercel/kv'
 import { convertToCoreMessages, streamText, ToolInvocation, ToolResultPart } from 'ai'
-import { codeBlock } from 'common-tags'
-import { convertToCoreTools, maxMessageContext, maxRowLimit, tools } from '~/lib/tools'
+import { getSystemPrompt } from '~/lib/system-prompt'
+import { convertToCoreTools, maxMessageContext, tools } from '~/lib/tools'
 import { createClient } from '~/utils/supabase/server'
 import { ChatInferenceEventToolResult, logEvent } from '~/utils/telemetry'
 
@@ -72,49 +72,8 @@ export async function POST(req: Request) {
   const coreMessages = convertToCoreMessages(trimmedMessageContext)
   const coreTools = convertToCoreTools(tools)
 
-  const result = await streamText({
-    system: codeBlock`
-      You are a helpful database assistant. Under the hood you have access to an in-browser Postgres database called PGlite (https://github.com/electric-sql/pglite).
-      Some special notes about this database:
-      - foreign data wrappers are not supported
-      - the following extensions are available:
-        - plpgsql [pre-enabled]
-        - vector (https://github.com/pgvector/pgvector) [pre-enabled]
-          - use <=> for cosine distance (default to this)
-          - use <#> for negative inner product
-          - use <-> for L2 distance
-          - use <+> for L1 distance
-          - note queried vectors will be truncated/redacted due to their size - export as CSV if the full vector is required
-
-      When generating tables, do the following:
-      - For primary keys, always use "id bigint primary key generated always as identity" (not serial)
-      - Prefer 'text' over 'varchar'
-      - Keep explanations brief but helpful
-      - Don't repeat yourself after creating the table
-
-      When creating sample data:
-      - Make the data realistic, including joined data
-      - Check for existing records/conflicts in the table
-
-      When querying data, limit to 5 by default. The maximum number of rows you're allowed to fetch is ${maxRowLimit} (to protect AI from token abuse).
-      If the user needs to fetch more than ${maxRowLimit} rows at once, they can export the query as a CSV.
-
-      When performing FTS, always use 'simple' (languages aren't available).
-
-      When importing CSVs try to solve the problem yourself (eg. use a generic text column, then refine)
-      vs. asking the user to change the CSV. No need to select rows after importing.
-
-      You also know math. All math equations and expressions must be written in KaTex and must be wrapped in double dollar \`$$\`:
-        - Inline: $$\\sqrt{26}$$
-        - Multiline:
-            $$
-            \\sqrt{26}
-            $$
-
-      No images are allowed. Do not try to generate or link images, including base64 data URLs.
-
-      Feel free to suggest corrections for suspected typos.
-    `,
+  const result = streamText({
+    system: getSystemPrompt(),
     model: openai(chatModel),
     messages: coreMessages,
     tools: coreTools,
@@ -158,7 +117,7 @@ export async function POST(req: Request) {
     },
   })
 
-  return result.toAIStreamResponse()
+  return result.toDataStreamResponse()
 }
 
 function getEventToolResult(toolResult: ToolResultPart): ChatInferenceEventToolResult | undefined {