Merge pull request miurla#9 from lizhe2004/main

support openai base url configuration

Author: miurla

.env.local.example

@@ -1,5 +1,8 @@
+# Used to set the base URL path for OpenAI API requests.The default value is https://api.openai.com/v1
+OPENAI_API_BASE=
 # OpenAI API key retrieved here: https://platform.openai.com/api-keys
 OPENAI_API_KEY=
 
 # Tavily API Key retrieved here: https://app.tavily.com/home
-TAVILY_API_KEY=
+TAVILY_API_KEY=
+

README.md

@@ -46,6 +46,8 @@ cp .env.local.example .env.local
 Your .env.local file should look like this:
 
 ```
+# Used to set the base URL path for OpenAI API requests.The default value is https://api.openai.com/v1
+OPENAI_API_BASE=
 # OpenAI API key retrieved here: https://platform.openai.com/api-keys
 OPENAI_API_KEY=[YOUR_OPENAI_API_KEY]
 
@@ -65,4 +67,4 @@ You can now visit http://localhost:3000.
 
 Host your own live version of Morphic with Vercel.
 
-[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fmiurla%2Fmorphic&env=OPENAI_API_KEY,TAVILY_API_KEY)
+[![Deploy with Vercel](https://vercel.com/button)](https://vercel.com/new/clone?repository-url=https%3A%2F%2Fgithub.com%2Fmiurla%2Fmorphic&env=OPENAI_API_BASE,OPENAI_API_KEY,TAVILY_API_KEY)

lib/agents/inquire.tsx

@@ -1,4 +1,4 @@
-import { openai } from 'ai/openai'
+import { OpenAI } from 'ai/openai'
 import { Copilot } from '@/components/copilot'
 import { createStreamableUI, createStreamableValue } from 'ai/rsc'
 import { ExperimentalMessage, experimental_streamObject } from 'ai'
@@ -8,6 +8,11 @@ export async function inquire(
   uiStream: ReturnType<typeof createStreamableUI>,
   messages: ExperimentalMessage[]
 ) {
+  const openai = new OpenAI({
+    baseUrl: process.env.OPENAI_API_BASE, // optional base URL for proxies etc.
+    apiKey: process.env.OPENAI_API_KEY, // optional API key, default to env property OPENAI_API_KEY
+    organization: '' // optional organization
+  })
   const objectStream = createStreamableValue<PartialInquiry>()
   uiStream.update(<Copilot inquiry={objectStream.value} />)
 

lib/agents/query-suggestor.tsx

@@ -3,12 +3,17 @@ import { ExperimentalMessage, experimental_streamObject } from 'ai'
 import { PartialRelated, relatedSchema } from '@/lib/schema/related'
 import { Section } from '@/components/section'
 import SearchRelated from '@/components/search-related'
-import { openai } from 'ai/openai'
+import { OpenAI } from 'ai/openai'
 
 export async function querySuggestor(
   uiStream: ReturnType<typeof createStreamableUI>,
   messages: ExperimentalMessage[]
 ) {
+  const openai = new OpenAI({
+    baseUrl: process.env.OPENAI_API_BASE, // optional base URL for proxies etc.
+    apiKey: process.env.OPENAI_API_KEY, // optional API key, default to env property OPENAI_API_KEY
+    organization: '' // optional organization
+  })
   const objectStream = createStreamableValue<PartialRelated>()
   uiStream.append(
     <Section title="Related" separator={true}>

lib/agents/researcher.tsx

@@ -7,7 +7,7 @@ import {
 } from 'ai'
 import { searchSchema } from '@/lib/schema/search'
 import { Section } from '@/components/section'
-import { openai } from 'ai/openai'
+import { OpenAI } from 'ai/openai'
 import { ToolBadge } from '@/components/tool-badge'
 import { SearchSkeleton } from '@/components/search-skeleton'
 import { SearchResults } from '@/components/search-results'
@@ -20,6 +20,12 @@ export async function researcher(
   streamText: ReturnType<typeof createStreamableValue<string>>,
   messages: ExperimentalMessage[]
 ) {
+  const openai = new OpenAI({
+    baseUrl: process.env.OPENAI_API_BASE, // optional base URL for proxies etc.
+    apiKey: process.env.OPENAI_API_KEY, // optional API key, default to env property OPENAI_API_KEY
+    organization: '' // optional organization
+  })
+
   const searchAPI: 'tavily' | 'exa' = 'tavily'
 
   let fullResponse = ''

lib/agents/task-manager.tsx

@@ -1,9 +1,15 @@
 import { ExperimentalMessage, experimental_generateObject } from 'ai'
-import { openai } from 'ai/openai'
+import { OpenAI } from 'ai/openai'
 import { nextActionSchema } from '../schema/next-action'
 
 // Decide whether inquiry is required for the user input
 export async function taskManager(messages: ExperimentalMessage[]) {
+  const openai = new OpenAI({
+    baseUrl: process.env.OPENAI_API_BASE, // optional base URL for proxies etc.
+    apiKey: process.env.OPENAI_API_KEY, // optional API key, default to env property OPENAI_API_KEY
+    organization: '' // optional organization
+  })
+
   const result = await experimental_generateObject({
     model: openai.chat('gpt-3.5-turbo'),
     system: `As a professional web researcher, your primary objective is to fully comprehend the user's query, conduct thorough web searches to gather the necessary information, and provide an appropriate response.