Merge branch 'main' of github.com:UniversityOfHelsinkiCS/gptwrapper

Author: MatiasSinisalo

scripts/k6_load_test.js

@@ -1,7 +1,8 @@
 /**
- * This script requires the use of k6 docker image version
+ * This script requires the use of k6 docker image and it needs to be run inside the docker container. Check the command below
+ * The k6 modules are imported from within the docker container. So it is not a dependency in Currechat
  *
- * run using: docker run --rm -i grafana/k6 run - <script.js
+ * run using: docker run --rm -i grafana/k6 run - <scripts/k6_load_test.js
  */
 
 import http from 'k6/http'
@@ -10,39 +11,29 @@ import { sleep, check } from 'k6'
 const staging = 'http://gptwrapper.toska.svc.cluster.local:8000/api/ai/stream'
 const local = 'http://172.17.0.1:3000/api//ai/stream'
 
+// k6 will pickup the options object internally.
 const vusit = 50
-
 export const options = {
   vus: vusit,
   iterations: vusit,
-  // duration: "1s",
 }
 
-const messages = [
-  'listaa viisi numeroa',
-  'listaa viisi väriä',
-  'listaa viisi esinettä',
-  'listaa viisi makua',
-  'listaa viisi huonekalua',
-  'listaa viisi presidenttiä',
-  'listaa viisi maata',
-  'listaa viisi ohjelmointikieltä',
-  'listaa viisi kaupunkia',
-  'listaa viisi vaatemerkkiä',
-  'listaa viisi urheilulajia',
-]
+const headers = {
+  headers: {
+    'Content-Type': 'application/json',
+    uid: 'testUser',
+    mail: '[email protected]',
+    preferredlanguage: 'fi',
+    hypersonsisuid: 'hy-hlo-123',
+    hygroupcn: 'grp-toska;hy-employees;grp-currechat-demostudents;grp-currechat-demoteachers',
+  },
+}
 
 const data = {
   options: {
-    messages: [
-      { role: 'system', content: 'Olet avulias avustaja' },
-      {
-        role: 'user',
-        content: undefined, // will be substituted from messages list
-      },
-    ],
+    messages: [],
     assistantInstructions: 'Olet avulias avustaja',
-    model: 'mock',
+    model: 'gpt-4o-mini',
     modelTemperature: 0.5,
     saveConsent: false,
     prevResponseId: '',
@@ -51,50 +42,52 @@ const data = {
   courseId: 'sandbox',
 }
 
-function tokensToText(tokenizedStr) {
-  return tokenizedStr
+const messages = ['listaa viisi esinettä', 'kerro niistä jotain', 'anna esimerkki jokaisesta esineestä', 'kerro yksityiskohtaisemmin', 'tiivistä kertomasi']
+
+function handleTokens(tokenizedStr) {
+  let texts = []
+  let responseId = ''
+
+  tokenizedStr
     .split('\n')
     .filter(Boolean)
-    .map((line) => {
+    .forEach((line) => {
       try {
-        return JSON.parse(line).text
+        const parsedLine = JSON.parse(line)
+        if (parsedLine.text) texts.push(parsedLine.text)
+        if (parsedLine.prevResponseId) responseId = parsedLine.prevResponseId
       } catch {
-        return ''
+        console.log('📌 error parsing line')
       }
     })
+
+  const response = texts
     .join('')
+    .replace(/\n+/g, ' ')
+    .replace(/\s{2,}/g, ' ')
+    .trim()
+
+  return { response, responseId }
 }
 
 export default function () {
   const url = `${staging}/v2`
+  let prevResponseId = ''
 
   for (const message of messages) {
-    const dataCopy = { ...data }
-    dataCopy.options.messages = [
-      { role: 'system', content: 'Olet load testissä' },
-      {
-        role: 'user',
-        content: message,
-      },
-    ]
-    const updatedData = dataCopy
+    const newData = { ...data }
+    newData.options.messages = [{ role: 'user', content: message }]
+    newData.options.prevResponseId = prevResponseId
 
     const payload = JSON.stringify({
-      data: JSON.stringify(updatedData),
+      data: JSON.stringify(newData),
     })
-    const params = {
-      headers: {
-        'Content-Type': 'application/json',
-        uid: 'testUser',
-        mail: '[email protected]',
-        preferredlanguage: 'fi',
-        hypersonsisuid: 'hy-hlo-123',
-        hygroupcn: 'grp-toska;hy-employees;grp-currechat-demostudents;grp-currechat-demoteachers',
-      },
-    }
 
-    let res = http.post(url, payload, params)
-    console.log('📌', tokensToText(res.body))
+    let res = http.post(url, payload, headers)
+    const { response, responseId } = handleTokens(res.body)
+    prevResponseId = responseId
+
+    console.log('📌 response:', response)
     check(res, { 'status is 200': (res) => res.status === 200 })
     sleep(5)
   }

src/client/components/ChatV2/ChatV2.tsx

@@ -1,5 +1,4 @@
 import RestartAltIcon from '@mui/icons-material/RestartAlt'
-import EmailIcon from '@mui/icons-material/Email'
 import HelpIcon from '@mui/icons-material/Help'
 import SettingsIcon from '@mui/icons-material/Settings'
 import { Alert, Box, Button, Drawer, Tooltip, Typography } from '@mui/material'
@@ -32,6 +31,7 @@ import Annotations from './Annotations'
 import { useIsEmbedded } from '../../contexts/EmbeddedContext'
 import { enqueueSnackbar } from 'notistack'
 import { useAnalyticsDispatch } from '../../stores/analytics'
+import EmailButton from './EmailButton'
 
 function useLocalStorageStateWithURLDefault(key: string, defaultValue: string, urlKey: string) {
   const [value, setValue] = useLocalStorageState(key, defaultValue)
@@ -397,6 +397,7 @@ export const ChatV2 = () => {
               ragIndex={ragIndex}
               setRagIndexId={setRagIndexId}
               ragIndices={ragIndices}
+              messages={messages}
             />
           </Drawer>
           <LeftMenu
@@ -411,6 +412,7 @@ export const ChatV2 = () => {
             ragIndex={ragIndex}
             setRagIndexId={setRagIndexId}
             ragIndices={ragIndices}
+            messages={messages}
           />
         </>
       )}
@@ -535,7 +537,20 @@ export const ChatV2 = () => {
   )
 }
 
-const LeftMenu = ({ sx, course, handleReset, user, t, setSettingsModalOpen, setDisclaimerStatus, showRagSelector, ragIndex, setRagIndexId, ragIndices }) => {
+const LeftMenu = ({
+  sx,
+  course,
+  handleReset,
+  user,
+  t,
+  setSettingsModalOpen,
+  setDisclaimerStatus,
+  showRagSelector,
+  ragIndex,
+  setRagIndexId,
+  ragIndices,
+  messages,
+}) => {
   return (
     <Box sx={sx}>
       <Box
@@ -553,19 +568,8 @@ const LeftMenu = ({ sx, course, handleReset, user, t, setSettingsModalOpen, setD
             <OutlineButtonBlack startIcon={<RestartAltIcon />} onClick={handleReset} id="empty-conversation-button">
               {t('chat:emptyConversation')}
             </OutlineButtonBlack>
-            <Tooltip
-              title={
-                <Typography variant="body2" sx={{ p: 0.5 }}>
-                  {t('info:email', { email: user?.email })}
-                </Typography>
-              }
-              arrow
-              placement="right"
-            >
-              <OutlineButtonBlack startIcon={<EmailIcon />} onClick={() => alert('Not yet supported')}>
-                {t('email:save')}
-              </OutlineButtonBlack>
-            </Tooltip>
+
+            <EmailButton messages={messages} disabled={!messages?.length} />
             <OutlineButtonBlack startIcon={<SettingsIcon />} onClick={() => setSettingsModalOpen(true)} id="settings-button">
               {t('chat:settings')}
             </OutlineButtonBlack>