Merge branch 'main' of https://github.com/okisdev/ChatChat

yours57 · May 29, 2024 · 68064d8 · 68064d8
2 parents 6302dbb + 93c1d9b
commit 68064d8
Show file tree

Hide file tree

Showing 9 changed files with 6,120 additions and 4,782 deletions.
diff --git a/app/[locale]/(home)/action.tsx b/app/[locale]/(home)/action.tsx
@@ -1,4 +1,4 @@
-import { ExperimentalMessage } from 'ai';
+import { CoreMessage } from 'ai';
 import { createAI, createStreamableUI, createStreamableValue, getMutableAIState, StreamableValue } from 'ai/rsc';
 
 import { AskFollowUpQuestion } from '@/components/layout/search/block/ask-follow-up-question';
@@ -13,9 +13,9 @@ import { SimpleModel } from '@/types/model';
 import { SearchEngineSetting, TChallengerAction } from '@/types/search';
 import { ProviderSetting } from '@/types/settings';
 
-const allowProvider = ['OpenAI'] as Provider[];
+const AllowSearchProvider = ['OpenAI'] as Provider[];
 
-const chat = async (model: SimpleModel, messages: ExperimentalMessage[]) => {
+const chat = async (model: SimpleModel, messages: CoreMessage[]) => {
     'use server';
 };
 
@@ -29,7 +29,7 @@ const search = async (
 ) => {
     'use server';
 
-    if (!allowProvider.includes(model?.provider)) {
+    if (!AllowSearchProvider.includes(model?.provider)) {
         return {
             id: Date.now(),
             isGenerating: false,
@@ -60,7 +60,7 @@ const search = async (
     const uiStream = createStreamableUI();
     const isGenerating = createStreamableValue(true);
 
-    const messages: ExperimentalMessage[] = aiState.get() as any;
+    const messages: CoreMessage[] = aiState.get() as any;
 
     const question = formData?.get('input') as string;
 
@@ -69,7 +69,7 @@ const search = async (
 
     if (content) {
         const message = { role: 'user', content };
-        messages.push(message as ExperimentalMessage);
+        messages.push(message as CoreMessage);
         aiState.update([...(aiState.get() as any), message]);
     }
 

diff --git a/app/api/search/google/route.ts b/app/api/search/google/route.ts
@@ -1,5 +1,5 @@
 import { createOpenAI } from '@ai-sdk/openai';
-import { experimental_streamText, ExperimentalMessage, StreamingTextResponse, ToolCallPart, ToolResultPart } from 'ai';
+import { CoreMessage, StreamingTextResponse, streamText as aiStreamText, ToolCallPart, ToolResultPart } from 'ai';
 import { createStreamableUI, createStreamableValue } from 'ai/rsc';
 
 import { searcherPrompt } from '@/lib/prompt';
@@ -17,7 +17,7 @@ export async function POST(req: Request) {
         config,
         stream,
     }: {
-        messages: ExperimentalMessage[];
+        messages: CoreMessage[];
         config: ApiConfig;
         stream: boolean;
     } = await req.json();
@@ -33,7 +33,7 @@ export async function POST(req: Request) {
         baseUrl: config.provider?.endpoint ?? process.env.OPENAI_API_ENDPOINT ?? 'https://api.openai.com/v1',
     });
 
-    const result = await experimental_streamText({
+    const result = await aiStreamText({
         model: openai.chat('gpt-4'),
         system: searcherPrompt,
         messages,

diff --git a/components/layout/settings/provider/anthropic.tsx b/components/layout/settings/provider/anthropic.tsx
@@ -8,7 +8,7 @@ export const AnthropicProvider = ({ anthropic, setAnthropic }: { anthropic: Prov
                 <p className='px-1 text-sm'>Anthropic API Key</p>
                 <Input
                     type='text'
-                    placeholder='sk-xxxx'
+                    placeholder='sk-ant-xxxx'
                     value={anthropic?.apiKey}
                     onChange={(e) => {
                         setAnthropic({

diff --git a/lib/search/challenger.tsx b/lib/search/challenger.tsx
@@ -1,5 +1,5 @@
 import { createOpenAI } from '@ai-sdk/openai';
-import { experimental_generateObject, ExperimentalMessage } from 'ai';
+import { CoreMessage, generateObject } from 'ai';
 import { z } from 'zod';
 
 import { challengerPrompt } from '@/lib/prompt';
@@ -10,15 +10,15 @@ export const challengerSchema = z.object({
     next: z.enum(['proceed', 'challenge']),
 });
 
-export const challenger = async (messages: ExperimentalMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
+export const challenger = async (messages: CoreMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
     'use server';
 
     const openai = createOpenAI({
         apiKey: currentProviderSettings?.OpenAI?.apiKey ?? process.env.OPENAI_API_KEY ?? '',
         // baseURL: currentProviderSettings?.OpenAI?.endpoint ?? process.env.OPENAI_API_ENDPOINT ?? 'https://api.openai.com/v1',
     });
 
-    return await experimental_generateObject({
+    return await generateObject({
         model: openai.chat(model.model_id ?? 'gpt-3.5-turbo'),
         system: challengerPrompt,
         messages,

diff --git a/lib/search/clarifier.tsx b/lib/search/clarifier.tsx
@@ -1,5 +1,5 @@
 import { createOpenAI } from '@ai-sdk/openai';
-import { experimental_streamObject, ExperimentalMessage } from 'ai';
+import { CoreMessage, streamObject } from 'ai';
 import { createStreamableUI, createStreamableValue } from 'ai/rsc';
 import { z } from 'zod';
 
@@ -17,7 +17,7 @@ export const clarifierSchema = z.object({
     clarifyPlaceholder: z.string().optional().describe('The clarify placeholder for input'),
 });
 
-export const clarifier = async (uiStream: ReturnType<typeof createStreamableUI>, messages: ExperimentalMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
+export const clarifier = async (uiStream: ReturnType<typeof createStreamableUI>, messages: CoreMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
     'use server';
 
     const objectStream = createStreamableValue<TClarifier>();
@@ -31,7 +31,7 @@ export const clarifier = async (uiStream: ReturnType<typeof createStreamableUI>,
         // baseURL: currentProviderSettings?.OpenAI?.endpoint ?? process.env.OPENAI_API_ENDPOINT ?? 'https://api.openai.com/v1',
     });
 
-    await experimental_streamObject({
+    await streamObject({
         model: openai.chat(model.model_id ?? 'gpt-4-turbo'),
         system: clarifierPrompt,
         messages,

diff --git a/lib/search/illustrator.tsx b/lib/search/illustrator.tsx
@@ -1,5 +1,5 @@
 import { createOpenAI } from '@ai-sdk/openai';
-import { experimental_streamObject, ExperimentalMessage } from 'ai';
+import { CoreMessage, streamObject } from 'ai';
 import { createStreamableUI, createStreamableValue } from 'ai/rsc';
 import { z } from 'zod';
 
@@ -13,7 +13,7 @@ export const illustratorSchema = z.object({
     items: z.array(z.object({ query: z.string() })).length(3),
 });
 
-export const illustrator = async (uiStream: ReturnType<typeof createStreamableUI>, messages: ExperimentalMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
+export const illustrator = async (uiStream: ReturnType<typeof createStreamableUI>, messages: CoreMessage[], model: SimpleModel, currentProviderSettings: ProviderSetting | null) => {
     'use server';
 
     const objectStream = createStreamableValue<TIllustrator>();
@@ -25,7 +25,7 @@ export const illustrator = async (uiStream: ReturnType<typeof createStreamableUI
         // baseURL: currentProviderSettings?.OpenAI?.endpoint ?? process.env.OPENAI_API_ENDPOINT ?? 'https://api.openai.com/v1',
     });
 
-    await experimental_streamObject({
+    await streamObject({
         model: openai.chat(model.model_id ?? 'gpt-4-turbo'),
         system: illustratorPrompt,
         messages,

diff --git a/lib/search/searcher.tsx b/lib/search/searcher.tsx
@@ -1,5 +1,5 @@
 import { createOpenAI } from '@ai-sdk/openai';
-import { experimental_streamText, ExperimentalMessage, ToolCallPart, ToolResultPart } from 'ai';
+import { CoreMessage, streamText as aiStreamText, ToolCallPart, ToolResultPart } from 'ai';
 import { createStreamableUI, createStreamableValue } from 'ai/rsc';
 import { z } from 'zod';
 
@@ -22,7 +22,7 @@ export const searcherSchema = z.object({
 export const searcher = async (
     uiStream: ReturnType<typeof createStreamableUI>,
     streamText: ReturnType<typeof createStreamableValue<string>>,
-    messages: ExperimentalMessage[],
+    messages: CoreMessage[],
     isProSearch: boolean,
     model: SimpleModel,
     currentSearchEngineSettings: SearchEngineSetting | null,
@@ -37,7 +37,7 @@ export const searcher = async (
         // baseURL: currentProviderSettings?.OpenAI?.endpoint ?? process.env.OPENAI_API_ENDPOINT ?? 'https://api.openai.com/v1',
     });
 
-    const result = await experimental_streamText({
+    const result = await aiStreamText({
         model: openai.chat(model.model_id ?? 'gpt-4-turbo'),
         maxTokens: 2500,
         system: searcherPrompt,

diff --git a/package.json b/package.json
@@ -11,9 +11,9 @@
     "eslint:fix": "eslint --ext .ts,.tsx --fix ."
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^0.0.5",
-    "@ai-sdk/google": "^0.0.5",
-    "@ai-sdk/openai": "^0.0.4",
+    "@ai-sdk/anthropic": "^0.0.16",
+    "@ai-sdk/google": "^0.0.16",
+    "@ai-sdk/openai": "^0.0.16",
     "@anthropic-ai/sdk": "^0.20.6",
     "@aws-sdk/client-bedrock-runtime": "^3.556.0",
     "@azure/openai": "^1.0.0-beta.12",
@@ -36,15 +36,15 @@
     "@types/file-saver": "^2.0.7",
     "@vercel/analytics": "^1.2.2",
     "@vercel/speed-insights": "^1.0.10",
-    "ai": "^3.0.24",
+    "ai": "^3.1.15",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.1.0",
     "cohere-ai": "^7.9.5",
     "file-saver": "^2.0.5",
     "groq-sdk": "^0.3.2",
     "jotai": "^2.8.0",
     "lucide-react": "^0.363.0",
-    "next": "14.2.2",
+    "next": "14.2.3",
     "next-intl": "^3.11.3",
     "next-themes": "^0.3.0",
     "openai": "^4.38.2",
@@ -80,6 +80,5 @@
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.5",
     "webpack": "^5.91.0"
-  },
-  "packageManager": "[email protected]"
-}
+  }
+}