Merge branch 'main' into next

jgoux · jgoux · commit 718f78803f48 · 2024-08-19T19:06:01.000+02:00
diff --git a/apps/web/README.md b/apps/web/README.md
@@ -13,9 +13,20 @@ Both databases are stored locally in the browser via IndexedDB. This means that
 
 Every PGlite instance runs in a Web Worker so that the main thread is not blocked.
 
+
 ## AI
 
-The AI component is powered by OpenAI's GPT-4o model. The project uses [Vercel's AI SDK ](https://sdk.vercel.ai/docs/introduction) to simplify message streams and tool calls.
+The AI component is powered by OpenAI's GPT-4o model by default. The project uses [Vercel's AI SDK](https://sdk.vercel.ai/docs/introduction) to simplify message streams and tool calls.
+
+### Environment Variables
+
+In addition to the required `OPENAI_API_KEY`, the following environment variables can be configured:
+
+- `OPENAI_API_BASE`: (Optional) The base URL for the OpenAI API. Defaults to `https://api.openai.com/v1`.
+- `OPENAI_MODEL`: (Optional) The model used by the AI component. Defaults to `gpt-4o-2024-08-06`.
+
+**NOTE**: The current prompts and tools are designed around the GPT-4o model. If you choose to use a different model, expect different behavior and results. Additionally, ensure that the model you select supports tool (function) call capabilities.
+
 
 ## Authentication
 
diff --git a/apps/web/app/api/chat/route.ts b/apps/web/app/api/chat/route.ts
@@ -1,4 +1,4 @@
-import { openai } from '@ai-sdk/openai'
+import { createOpenAI } from '@ai-sdk/openai'
 import { Ratelimit } from '@upstash/ratelimit'
 import { kv } from '@vercel/kv'
 import { ToolInvocation, convertToCoreMessages, streamText } from 'ai'
@@ -27,6 +27,15 @@ type Message = {
   toolInvocations?: (ToolInvocation & { result: any })[]
 }
 
+const chatModel = process.env.OPENAI_MODEL ?? 'gpt-4o-2024-08-06'
+
+// Configure OpenAI client with custom base URL
+const openai = createOpenAI({
+  apiKey: process.env.OPENAI_API_KEY,
+  baseURL: process.env.OPENAI_API_BASE ?? 'https://api.openai.com/v1',
+  compatibility: 'strict',
+})
+
 export async function POST(req: Request) {
   const supabase = createClient()
 
@@ -82,7 +91,7 @@ export async function POST(req: Request) {
 
       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:
@@ -94,7 +103,7 @@ export async function POST(req: Request) {
 
       Feel free to suggest corrections for suspected typos.
     `,
-    model: openai('gpt-4o-2024-08-06'),
+    model: openai(chatModel),
     messages: convertToCoreMessages(trimmedMessageContext),
     tools: convertToCoreTools(tools),
     async onFinish({ usage }) {
