add assistant instructions attachement funcionality

Author: sutigit

src/client/components/ChatV2/ChatV2.tsx

@@ -43,7 +43,11 @@ export const ChatV2 = () => {
 
   // local storage
   const localStoragePrefix = 'general'
-  const [system, setSystem] = useLocalStorageState<{ content: string }>(`${localStoragePrefix}-chat-system`, { content: '' })
+  // TODO: Do translation
+  const defaultInstructions = 'Olet avulias avustaja'
+  const [assistantInstructions, setAssistantInstructions] = useLocalStorageState<{ content: string }>(`${localStoragePrefix}-chat-instructions`, {
+    content: defaultInstructions,
+  })
   const [message, setMessage] = useLocalStorageState<{ content: string }>(`${localStoragePrefix}-chat-current`, { content: '' })
   const [messages, setMessages] = useLocalStorageState<Message[]>(`${localStoragePrefix}-chat-messages`, [])
   const [prevResponse, setPrevResponse] = useLocalStorageState<{ id: string }>(`${localStoragePrefix}-prev-response`, { id: '' })
@@ -166,7 +170,7 @@ export const ChatV2 = () => {
 
     try {
       const { tokenUsageAnalysis, stream } = await getCompletionStream({
-        system: system.content,
+        assistantInstructions: assistantInstructions.content,
         messages: newMessages,
         ragIndexId: ragIndexId ?? undefined,
         model: model.name,
@@ -408,6 +412,8 @@ export const ChatV2 = () => {
       <SettingsModal
         open={settingsModalOpen}
         setOpen={setSettingsModalOpen}
+        assistantInstructions={assistantInstructions.content}
+        setAssistantInstructions={(updatedInstructions) => setAssistantInstructions({ content: updatedInstructions })}
         model={model.name}
         setModel={(name) => setModel({ name })}
         setRagIndex={setRagIndexId}

src/client/components/ChatV2/SettingsModal.tsx

@@ -9,14 +9,26 @@ import { RagIndexAttributes } from '../../../shared/types'
 interface SettingsModalProps {
   open: boolean
   setOpen: (open: boolean) => void
+  assistantInstructions: string
+  setAssistantInstructions: (instructions: string) => void
   model: string
   setModel: (model: string) => void
   setRagIndex: (ragIndex: number) => void
   ragIndices: RagIndexAttributes[]
   currentRagIndex: RagIndexAttributes
 }
 
-export const SettingsModal: React.FC<SettingsModalProps> = ({ open, setOpen, model, setModel, setRagIndex, ragIndices, currentRagIndex }) => {
+export const SettingsModal: React.FC<SettingsModalProps> = ({
+  open,
+  setOpen,
+  assistantInstructions,
+  setAssistantInstructions,
+  model,
+  setModel,
+  setRagIndex,
+  ragIndices,
+  currentRagIndex,
+}) => {
   return (
     <Modal open={open} onClose={() => setOpen(false)}>
       <Box
@@ -51,7 +63,14 @@ export const SettingsModal: React.FC<SettingsModalProps> = ({ open, setOpen, mod
         {/* <ModelSelector currentModel={model} setModel={setModel} models={validModels.map((m) => m.name)} /> */}
         {/* Disabled for now due to RAG not functioning cirreclty */}
         {/* <RagSelector currentRagIndex={currentRagIndex} setRagIndex={setRagIndex} ragIndices={ragIndices} /> */}
-        <TextField multiline minRows={6} maxRows={10} label="Alustuksen sisältö" defaultValue="Olet avulias avustaja" />
+        <TextField
+          multiline
+          minRows={6}
+          maxRows={10}
+          label="Alustuksen sisältö"
+          value={assistantInstructions}
+          onChange={(e) => setAssistantInstructions(e.target.value)}
+        />
       </Box>
     </Modal>
   )

src/client/components/ChatV2/util.ts

@@ -3,7 +3,7 @@ import { Message } from '../../types'
 import { postAbortableStream } from '../../util/apiClient'
 
 interface GetCompletoinStreamProps {
-  system: string
+  assistantInstructions: string
   messages: Message[]
   model: string
   formData: FormData
@@ -16,7 +16,7 @@ interface GetCompletoinStreamProps {
   saveConsent: boolean
 }
 export const getCompletionStream = async ({
-  system,
+  assistantInstructions,
   messages,
   model,
   formData,
@@ -34,10 +34,11 @@ export const getCompletionStream = async ({
       messages: [
         {
           role: 'system',
-          content: system,
+          content: assistantInstructions,
         },
         ...messages,
       ],
+      assistantInstructions,
       ragIndexId,
       model,
       userConsent,

src/server/routes/openai.ts

@@ -50,6 +50,7 @@ const fileParsing = async (options: any, req: any) => {
 const PostStreamSchemaV2 = z.object({
   options: z.object({
     model: z.string(),
+    assistantInstructions: z.string().optional(),
     messages: z.array(z.any()),
     userConsent: z.boolean().optional(),
     modelTemperature: z.number().optional(),
@@ -153,19 +154,22 @@ openaiRouter.post('/stream/v2', upload.single('file'), async (r, res) => {
 
   // Check rag index
   let vectorStoreId: string | undefined = undefined
-  let instructions: string | undefined = undefined
+  let instructions: string | undefined = options.assistantInstructions
 
   if (ragIndexId && user.isAdmin) {
     const ragIndex = await RagIndex.findByPk(ragIndexId)
     if (ragIndex) {
       if (courseId && ragIndex.courseId !== courseId) {
-        logger.error('RagIndex does not belong to the course', { ragIndexId, courseId })
+        logger.error('RagIndex does not belong to the course', {
+          ragIndexId,
+          courseId,
+        })
         res.status(403).send('RagIndex does not belong to the course')
         return
       }
 
       vectorStoreId = ragIndex.metadata.azureVectorStoreId
-      instructions = ragIndex.metadata.instructions ?? DEFAULT_RAG_SYSTEM_PROMPT
+      instructions = `${instructions} ${ragIndex.metadata.instructions ?? DEFAULT_RAG_SYSTEM_PROMPT}`
 
       console.log('using', ragIndex.toJSON())
     } else {
@@ -407,7 +411,10 @@ openaiRouter.post('/stream/:courseId/:version?', upload.single('file'), async (r
   let events
   if (version === 'v2') {
     const latestMessage = options.messages[options.messages.length - 1] // Adhoc to input only the latest message
-    events = await responsesClient.createResponse({ input: [latestMessage], prevResponseId: options.prevResponseId })
+    events = await responsesClient.createResponse({
+      input: [latestMessage],
+      prevResponseId: options.prevResponseId,
+    })
   } else {
     events = await getCompletionEvents(options)
   }