feat: 🎸 upgrade openai models

apps/dashboard/components/AgentInputs/ModelInput.tsx

@@ -20,6 +20,7 @@ import { useSession } from 'next-auth/react';
 import React, { useState } from 'react';
 import { useFormContext } from 'react-hook-form';
 
+import { ModelConfig } from '@chaindesk/lib/config';
 import { CUSTOMER_SUPPORT } from '@chaindesk/lib/prompt-templates';
 import { PromptTypesLabels, RouteNames } from '@chaindesk/lib/types';
 import { CreateAgentSchema } from '@chaindesk/lib/types/dtos';
@@ -106,19 +107,22 @@ export default function ModelInput({}: Props) {
           }}
         >
           <Option value={AgentModelName.gpt_3_5_turbo}>
-            OpenAI gpt-3.5-turbo
+            gpt-3.5-turbo - 16K -{' '}
+            {ModelConfig[AgentModelName.gpt_3_5_turbo].cost} credit/query
           </Option>
           <Option
-            value={AgentModelName.gpt_3_5_turbo_16k}
+            value={AgentModelName.gpt_4}
             disabled={!session?.data?.organization?.isPremium}
           >
-            OpenAI gpt-3.5-turbo 16k (premium)
+            gpt-4 - 8K - {ModelConfig[AgentModelName.gpt_4].cost} credits/query
+            (premium)
           </Option>
           <Option
-            value={AgentModelName.gpt_4}
+            value={AgentModelName.gpt_4_turbo}
             disabled={!session?.data?.organization?.isPremium}
           >
-            OpenAI gpt-4 (premium)
+            gpt-4-turbo - 128k - {ModelConfig[AgentModelName.gpt_4_turbo].cost}{' '}
+            credits/query (premium)
           </Option>
         </Select>
       </FormControl>

apps/dashboard/components/AgentSettingsTab/index.tsx

@@ -42,10 +42,16 @@ function AgentSettingsTab(props: Props) {
 
   useEffect(() => {
     if (router.query.settingTab) {
-      delete router.query.settingTab;
-      router.replace(router, undefined, { shallow: true });
+      setState({
+        currentTab: router.query.settingTab as string,
+      });
     }
-  }, []);
+  }, [router.query.settingTab]);
+
+  const handleChangeTab = (tab: string) => {
+    router.query.settingTab = tab;
+    router.replace(router, undefined, { shallow: true });
+  };
 
   if (!agent) {
     return null;
@@ -72,11 +78,7 @@ function AgentSettingsTab(props: Props) {
           <ListItem>
             <ListItemButton
               selected={state.currentTab === 'general'}
-              onClick={() =>
-                setState({
-                  currentTab: 'general',
-                })
-              }
+              onClick={() => handleChangeTab('general')}
             >
               <ListItemDecorator>
                 <SettingsRoundedIcon />
@@ -87,11 +89,7 @@ function AgentSettingsTab(props: Props) {
           <ListItem>
             <ListItemButton
               selected={state.currentTab === 'model'}
-              onClick={() =>
-                setState({
-                  currentTab: 'model',
-                })
-              }
+              onClick={() => handleChangeTab('model')}
             >
               <ListItemDecorator>
                 <SmartToyRoundedIcon />
@@ -102,11 +100,7 @@ function AgentSettingsTab(props: Props) {
           <ListItem>
             <ListItemButton
               selected={state.currentTab === 'tools'}
-              onClick={() =>
-                setState({
-                  currentTab: 'tools',
-                })
-              }
+              onClick={() => handleChangeTab('tools')}
             >
               <ListItemDecorator>
                 <SpokeRoundedIcon />
@@ -117,11 +111,7 @@ function AgentSettingsTab(props: Props) {
           <ListItem>
             <ListItemButton
               selected={state.currentTab === 'security'}
-              onClick={() =>
-                setState({
-                  currentTab: 'security',
-                })
-              }
+              onClick={() => handleChangeTab('security')}
             >
               <ListItemDecorator>
                 <SecurityRoundedIcon />

apps/dashboard/components/AgentTable.tsx

@@ -13,7 +13,7 @@ import Link from 'next/link';
 import * as React from 'react';
 
 import { RouteNames } from '@chaindesk/lib/types';
-import { Agent, Datastore } from '@chaindesk/prisma';
+import { Agent } from '@chaindesk/prisma';
 
 export default function AgentTable({ items }: { items: Agent[] }) {
   return (
@@ -46,8 +46,8 @@ export default function AgentTable({ items }: { items: Agent[] }) {
             <tr>
               <th style={{ width: 120, padding: 12 }}>Name</th>
               <th style={{ width: 120, padding: 12 }}>Description</th>
+              <th style={{ width: 120, padding: 12 }}>Model</th>
               <th style={{ width: 220, padding: 12 }}>Visibility</th>
-              {/* <th style={{ width: 120, padding: 12 }}>Subscription</th> */}
               <th style={{ width: 160, padding: 12 }}> </th>
             </tr>
           </thead>
@@ -85,6 +85,11 @@ export default function AgentTable({ items }: { items: Agent[] }) {
                   </Typography>
                 </td>
 
+                <td>
+                  <Chip variant="soft" size="sm" color={'neutral'}>
+                    {agent.modelName}
+                  </Chip>
+                </td>
                 <td>
                   <Chip
                     variant="soft"

apps/dashboard/pages/agents/[agentId]/index.tsx

@@ -182,6 +182,18 @@ export default function AgentPage() {
               <Typography level="h1" fontSize="xl4">
                 {query?.data?.name}
               </Typography>
+              <Chip
+                size="sm"
+                variant="soft"
+                color={'primary'}
+                onClick={() => {
+                  router.query.tab = 'settings';
+                  router.query.settingTab = 'model';
+                  router.push(router);
+                }}
+              >
+                {query?.data?.modelName}
+              </Chip>
               <Chip
                 size="sm"
                 variant="soft"
@@ -191,6 +203,11 @@ export default function AgentPage() {
                     private: 'neutral',
                   }[query?.data?.visibility!] as ColorPaletteProp
                 }
+                onClick={() => {
+                  router.query.tab = 'settings';
+                  router.query.settingTab = 'security';
+                  router.push(router);
+                }}
               >
                 {query?.data?.visibility}
               </Chip>

apps/dashboard/pages/api/agents/[id]/query.tsx

@@ -2,13 +2,13 @@ import cuid from 'cuid';
 import { NextApiRequest, NextApiResponse } from 'next';
 
 import { NewConversation, render } from '@chaindesk/emails';
-import { queryCountConfig } from '@chaindesk/lib/account-config';
 import AgentManager from '@chaindesk/lib/agent';
 import { ApiError, ApiErrorType } from '@chaindesk/lib/api-error';
 import {
   formatOrganizationSession,
   sessionOrganizationInclude,
 } from '@chaindesk/lib/auth';
+import { ModelConfig } from '@chaindesk/lib/config';
 import ConversationManager from '@chaindesk/lib/conversation';
 import {
   createLazyAuthHandler,
@@ -177,7 +177,7 @@ export const chatAgentRequest = async (
       data: {
         nbAgentQueries:
           (agent?.organization?.usage?.nbAgentQueries || 0) +
-          (queryCountConfig?.[agent?.modelName] || 1),
+          (ModelConfig?.[agent?.modelName].cost || 1),
       },
     }),
   ]);

apps/dashboard/pages/api/chains/run.ts

@@ -41,7 +41,7 @@ export const runChainRequest = async (
     },
     include: {
       messages: {
-        take: -4,
+        take: -24,
         orderBy: {
           createdAt: 'asc',
         },

apps/dashboard/tests/test-prompts.ts

@@ -30,7 +30,7 @@ const customerSupportDataset = [
 (async () => {
   const agent = await prisma.agent.findUnique({
     where: {
-      id: 'cloiefapb000q0ut1pamawveh',
+      id: 'cloisatop00080u2u5cuzwphg',
     },
     include: {
       tools: {

packages/lib/account-config.ts

@@ -21,13 +21,6 @@ type Plan = {
   };
 };
 
-export const queryCountConfig = {
-  [AgentModelName.gpt_3_5_turbo]: 1,
-  [AgentModelName.gpt_3_5_turbo_16k]: 15,
-  [AgentModelName.gpt_4]: 20,
-  [AgentModelName.gpt_4_32k]: 30,
-};
-
 const config: {
   [key in SubscriptionPlan]: Plan;
 } = {

packages/lib/config.ts

@@ -15,20 +15,34 @@ export const XPBNPLabels = {
 
 export const ModelConfig = {
   [AgentModelName.gpt_3_5_turbo]: {
-    name: 'gpt-3.5-turbo',
+    name: 'gpt-3.5-turbo-1106',
     maxTokens: 4096,
+    cost: 1,
   },
   [AgentModelName.gpt_3_5_turbo_16k]: {
-    name: 'gpt-3.5-turbo-16k',
+    name: 'gpt-3.5-turbo-1106',
     maxTokens: 16384,
+    cost: 1,
   },
   [AgentModelName.gpt_4]: {
     name: 'gpt-4',
     maxTokens: 8192,
+    cost: 30,
   },
   [AgentModelName.gpt_4_32k]: {
     name: 'gpt-4-32k',
     maxTokens: 32768,
+    cost: 60,
+  },
+  [AgentModelName.gpt_4_turbo]: {
+    name: 'gpt-4-1106-preview',
+    maxTokens: 128000,
+    cost: 13,
+  },
+  [AgentModelName.gpt_4_turbo_vision]: {
+    name: 'gpt-4-vision-preview',
+    maxTokens: 128000,
+    cost: 13,
   },
 };
 

packages/prisma/migrations/20231106203619_/migration.sql

@@ -0,0 +1,10 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "AgentModelName" ADD VALUE 'gpt_4_turbo';
+ALTER TYPE "AgentModelName" ADD VALUE 'gpt_4_turbo_vision';

packages/prisma/schema.prisma

@@ -637,6 +637,8 @@ enum AgentModelName {
   gpt_3_5_turbo_16k
   gpt_4
   gpt_4_32k
+  gpt_4_turbo
+  gpt_4_turbo_vision
 }
 
 enum MessageEval {