fixes

Author: Veikkosuhonen

e2e/prompts.spec.ts

@@ -80,6 +80,8 @@ test.describe('Prompts', () => {
     // Close settings
     await page.keyboard.press('Escape')
 
+    await useMockModel(page)
+
     // Send something
     await sendChatMessage(page, 'testinen morjens')
     await closeSendPreference(page)
@@ -129,6 +131,8 @@ test.describe('Prompts', () => {
     // The prompt is active.
     await expect(page.getByTestId('prompt-selector-button').first()).toContainText(newPromptName)
 
+    await useMockModel(page)
+
     // Send something
     await sendChatMessage(page, 'rag')
     await closeSendPreference(page)
@@ -181,6 +185,8 @@ test.describe('Prompts', () => {
     await expect(page.getByTestId('assistant-instructions-input')).toHaveValue(newPromptContent)
     await page.getByTestId('close-settings').click()
 
+    await useMockModel(page)
+
     // Send message, response should echo the prompt
     await sendChatMessage(page, 'testinen morjens')
     await closeSendPreference(page)

src/client/components/ChatV2/ModelSelector.tsx

@@ -1,8 +1,8 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { MenuItem, Typography, Tooltip, Menu } from '@mui/material'
+import { MenuItem, Typography, Menu } from '@mui/material'
 import { KeyboardArrowDown, SmartToy } from '@mui/icons-material'
-import { FREE_MODEL, ValidModelName, validModels } from '../../../config'
+import { FREE_MODEL, inProduction, ValidModelName, validModels } from '@config'
 import { OutlineButtonBlack } from './general/Buttons'
 import { usePromptState } from './PromptState'
 import useCurrentUser from '../../hooks/useCurrentUser'
@@ -36,7 +36,7 @@ const ModelSelector = ({
       return [activePrompt.model]
     }
     const models = validModels.map((model) => model.name)
-    return models.filter((model) => !isTokenLimitExceeded || model === FREE_MODEL).filter((model) => user?.isAdmin || model !== 'mock')
+    return models.filter((model) => !isTokenLimitExceeded || model === FREE_MODEL).filter((model) => user?.isAdmin || !inProduction || model !== 'mock')
   }, [isTokenLimitExceeded, user, activePrompt])
 
   console.log(availableModels, activePrompt)

src/server/db/seeders/chatInstance.ts

@@ -10,7 +10,6 @@ const chatInstances = Object.values(TEST_COURSES).map((course) => ({
   courseId: course.id,
   activityPeriod: course.activityPeriod,
   code: course.code,
-  model: 'model' in course ? course.model : undefined,
   usageLimit: 'usageLimit' in course ? course.usageLimit : undefined,
   courseUnits: [
     {

src/server/routes/user.ts

@@ -86,8 +86,6 @@ userRouter.get('/status', async (req, res) => {
   res.send({
     usage,
     limit,
-    // model,
-    // models,
   })
   return
 })

src/server/services/chatInstances/usage.ts

@@ -79,7 +79,7 @@ export const getUserStatus = async (user: UserType, courseId: string) => {
     where: {
       courseId,
     },
-    attributes: ['id', 'usageLimit', 'courseId', 'model'],
+    attributes: ['id', 'usageLimit', 'courseId'],
   })
 
   if (!chatInstance) throw ApplicationError.NotFound('Chat instance not found')