model now based on prompt, not course

Author: Veikkosuhonen

src/client/components/Admin/ChatInstances/ChatInstanceTable.tsx

@@ -43,12 +43,6 @@ const headCells: readonly HeadCell[] = [
     disablePadding: false,
     label: 'Description',
   },
-  {
-    id: 'model',
-    numeric: true,
-    disablePadding: false,
-    label: 'Model',
-  },
   {
     id: 'usageLimit',
     numeric: true,
@@ -139,7 +133,6 @@ const ChatInstanceTableChatInstanceWithTokens = React.memo(
                   </Link>
                 </TableCell>
                 <TableCell align="right">{row.description}</TableCell>
-                <TableCell align="right">{row.model}</TableCell>
                 <TableCell sx={{ fontFamily: 'monospace' }} align="right">
                   {row.usageLimit}
                 </TableCell>

src/client/components/ChatV2/ChatV2.tsx

@@ -94,7 +94,6 @@ const ChatV2Content = () => {
   const [fileName, setFileName] = useState<string>('')
   const [tokenUsageWarning, setTokenUsageWarning] = useState<string>('')
   const [tokenUsageAlertOpen, setTokenUsageAlertOpen] = useState<boolean>(false)
-  const [allowedModels, setAllowedModels] = useState<ValidModelName[]>([])
   const [chatLeftSidePanelOpen, setChatLeftSidePanelOpen] = useState<boolean>(false)
   const [activeToolResult, setActiveToolResult0] = useState<ToolCallResultEvent | undefined>()
 
@@ -263,27 +262,7 @@ const ChatV2Content = () => {
   useEffect(() => {
     if (!userStatus) return
 
-    const { usage, limit, model: defaultCourseModel, models: courseModels } = userStatus
-
-    let allowedModels: ValidModelName[] = []
-
-    if (course && courseModels) {
-      allowedModels = courseModels
-
-      if (courseModels.includes(activeModel)) {
-        setActiveModel(activeModel)
-      } else {
-        setActiveModel(defaultCourseModel ?? courseModels[0])
-      }
-    } else {
-      allowedModels = validModels.map((m) => m.name) // [gpt-5, gpt-4o, gpt-4o-mini, mock] 23.7.2025
-    }
-
-    // Mock model is only visible to admins in production
-    if (!user?.isAdmin && inProduction) {
-      allowedModels = allowedModels.filter((model) => model !== 'mock')
-    }
-    setAllowedModels(allowedModels)
+    const { usage, limit } = userStatus
 
     const tokenUseExceeded = usage >= limit
 
@@ -388,7 +367,6 @@ const ChatV2Content = () => {
               messages={messages}
               currentModel={activeModel}
               setModel={setActiveModel}
-              availableModels={allowedModels}
             />
           </Drawer>
         ) : (
@@ -404,7 +382,6 @@ const ChatV2Content = () => {
             messages={messages}
             currentModel={activeModel}
             setModel={setActiveModel}
-            availableModels={allowedModels}
           />
         ))}
 
@@ -579,7 +556,6 @@ const LeftMenu = ({
   messages,
   currentModel,
   setModel,
-  availableModels,
 }: {
   sx?: object
   course?: Course
@@ -590,7 +566,6 @@ const LeftMenu = ({
   messages: ChatMessage[]
   currentModel: ValidModelName
   setModel: (model: ValidModelName) => void
-  availableModels: ValidModelName[]
 }) => {
   const { t } = useTranslation()
   const { courseId } = useParams()
@@ -623,7 +598,7 @@ const LeftMenu = ({
           <OutlineButtonBlack startIcon={<RestartAltIcon />} onClick={handleReset} data-testid="empty-conversation-button">
             {t('chat:emptyConversation')}
           </OutlineButtonBlack>
-          <ModelSelector currentModel={currentModel} setModel={setModel} availableModels={availableModels} isTokenLimitExceeded={isTokenLimitExceeded} />
+          <ModelSelector currentModel={currentModel} setModel={setModel} isTokenLimitExceeded={isTokenLimitExceeded} />
           <PromptSelector sx={{ width: '100%' }} />
           <EmailButton messages={messages} disabled={!messages?.length} />
           <OutlineButtonBlack startIcon={<Tune />} onClick={() => setSettingsModalOpen(true)} data-testid="settings-button">

src/client/components/ChatV2/ModelSelector.tsx

@@ -2,24 +2,25 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { MenuItem, Typography, Tooltip, Menu } from '@mui/material'
 import { KeyboardArrowDown, SmartToy } from '@mui/icons-material'
-import { FREE_MODEL, ValidModelName } from '../../../config'
+import { FREE_MODEL, ValidModelName, validModels } from '../../../config'
 import { OutlineButtonBlack } from './general/Buttons'
+import { usePromptState } from './PromptState'
+import useCurrentUser from '../../hooks/useCurrentUser'
 
 const ModelSelector = ({
   currentModel,
   setModel,
-  availableModels,
   isTokenLimitExceeded,
 }: {
   currentModel: ValidModelName
   setModel: (model: ValidModelName) => void
-  availableModels: ValidModelName[]
   isTokenLimitExceeded: boolean
 }) => {
   const { t } = useTranslation()
   const [anchorEl, setAnchorEl] = React.useState<null | HTMLElement>(null)
   const open = Boolean(anchorEl)
-  const validModel = availableModels.includes(currentModel) ? currentModel : ''
+  const { user } = useCurrentUser()
+  const { activePrompt } = usePromptState()
 
   const handleClick = (event: React.MouseEvent<HTMLElement>) => {
     setAnchorEl(event.currentTarget)
@@ -30,10 +31,26 @@ const ModelSelector = ({
     setAnchorEl(null)
   }
 
+  const availableModels = React.useMemo(() => {
+    if (activePrompt?.model) {
+      return [activePrompt.model]
+    }
+    const models = validModels.map((model) => model.name)
+    return models.filter((model) => !isTokenLimitExceeded || model === FREE_MODEL).filter((model) => user?.isAdmin || model !== 'mock')
+  }, [isTokenLimitExceeded, user, activePrompt])
+
+  console.log(availableModels, activePrompt)
+
   return (
     <>
-      <OutlineButtonBlack startIcon={<SmartToy />} endIcon={<KeyboardArrowDown />} onClick={handleClick} data-testid="model-selector">
-        {`${t('admin:model')}: ${validModel}`}
+      <OutlineButtonBlack
+        startIcon={<SmartToy />}
+        endIcon={<KeyboardArrowDown />}
+        onClick={handleClick}
+        data-testid="model-selector"
+        disabled={availableModels.length === 1}
+      >
+        {`${t('admin:model')}: ${currentModel}`}
       </OutlineButtonBlack>
       <Menu
         anchorEl={anchorEl}
@@ -48,13 +65,7 @@ const ModelSelector = ({
         }}
       >
         {availableModels.map((model) => (
-          <MenuItem
-            key={model}
-            value={model}
-            onClick={() => handleSelect(model)}
-            disabled={isTokenLimitExceeded && model !== FREE_MODEL}
-            data-testid={`${model}-option`}
-          >
+          <MenuItem key={model} value={model} onClick={() => handleSelect(model)} data-testid={`${model}-option`}>
             <Typography>
               {model}
               {model === FREE_MODEL && (

src/client/components/Courses/Course/EditCourseForm.tsx

@@ -13,14 +13,13 @@ const EditCourseForm = forwardRef(({ course, setOpen, user }: { course: Course;
   const { t } = useTranslation()
   const mutation = useEditCourseMutation(course?.courseId as string)
 
-  const { model: currentModel, usageLimit: currentUsageLimit } = course
+  const { usageLimit: currentUsageLimit } = course
 
   const currentDate = new Date().toISOString()
   const { startDate: defaultStart, endDate: defaultEnd } = course?.activityPeriod || { startDate: currentDate, endDate: currentDate }
 
   const [startDate, setStartDate] = useState(new Date(defaultStart))
   const [endDate, setEndDate] = useState(new Date(defaultEnd))
-  const [model, setModel] = useState(currentModel)
   const [usageLimit, setUsageLimit] = useState(currentUsageLimit)
   const [saveDiscussions, setSaveDiscussions] = useState(course.saveDiscussions)
   const [notOptoutSaving, setNotOptoutSaving] = useState(course.notOptoutSaving)
@@ -35,7 +34,6 @@ const EditCourseForm = forwardRef(({ course, setOpen, user }: { course: Course;
     try {
       mutation.mutate({
         activityPeriod,
-        model,
         usageLimit,
         saveDiscussions,
         notOptoutSaving,
@@ -59,27 +57,11 @@ const EditCourseForm = forwardRef(({ course, setOpen, user }: { course: Course;
         </Box>
 
         <Box my={3} display="flex" justifyContent="space-between" flexDirection="row">
-          <Box>
-            <Typography mb={1} variant="h5">
-              {t('admin:model')}
-            </Typography>
-            <Typography mb={1}>{t('admin:modelInfo')}</Typography>
-            <Select sx={{ m: 1, width: '300px' }} value={model} onChange={(e) => setModel(e.target.value as ValidModelName)}>
-              {validModels.map(({ name: modelName }) => (
-                <MenuItem key={modelName} value={modelName}>
-                  {modelName}
-                </MenuItem>
-              ))}
-            </Select>
-          </Box>
-
-          <Box>
-            <Typography mb={1} variant="h5">
-              {t('admin:usageLimit')}
-            </Typography>
-            <Typography mb={1}>{t('admin:usageLimitInfo')}</Typography>
-            <TextField sx={{ m: 1, width: '300px' }} value={usageLimit} type="number" onChange={(e) => setUsageLimit(Number(e.target.value))} />
-          </Box>
+          <Typography mb={1} variant="h5">
+            {t('admin:usageLimit')}
+          </Typography>
+          <Typography mb={1}>{t('admin:usageLimitInfo')}</Typography>
+          <TextField sx={{ m: 1, width: '300px' }} value={usageLimit} type="number" onChange={(e) => setUsageLimit(Number(e.target.value))} />
         </Box>
 
         {user.isAdmin && (

src/client/components/Courses/Course/index.tsx

@@ -139,7 +139,7 @@ const Course = () => {
     const usersResponsibility: Responsebility | undefined = responsibilities.find((r: Responsebility) => {
       return r.user.id === user.id
     })
-    const isResponsible = usersResponsibility != undefined
+    const isResponsible = usersResponsibility !== undefined
     return (
       <>
         {!isResponsible ? (
@@ -204,7 +204,6 @@ const Course = () => {
             {courseEnabled && (
               <div style={{ ...left, boxSizing: 'border-box' }}>
                 <Typography>
-                  {t('admin:model')}: {chatInstance.model} <span style={{ marginRight: 20 }} />
                   {t('admin:usageLimit')}: {chatInstance.usageLimit}
                 </Typography>
               </div>

src/client/hooks/useCourseMutation.ts

@@ -1,12 +1,11 @@
 import { useMutation } from '@tanstack/react-query'
 
-import { ActivityPeriod } from '../types'
+import type { ActivityPeriod } from '../types'
 import queryClient from '../util/queryClient'
 import apiClient from '../util/apiClient'
 
 interface UpdatedCourseData {
   activityPeriod: ActivityPeriod
-  model: string
   usageLimit: number
   saveDiscussions: boolean
   notOptoutSaving: boolean

src/client/types.ts

@@ -66,14 +66,14 @@ export type Prompt = {
   type: 'CHAT_INSTANCE' | 'PERSONAL'
   createdAt: string
   ragIndexId?: number
+  model?: ValidModelName
 }
 
 export interface ChatInstance {
   promptCount?: number
   id: string
   name: Locales
   description: string
-  model: ValidModelName
   usageLimit: number
   resetCron?: string
   courseId?: string
@@ -82,14 +82,6 @@ export interface ChatInstance {
   activityPeriod: ActivityPeriod
 }
 
-export interface AccessGroup {
-  id: string
-  iamGroup: string
-  model: ValidModelName
-  usageLimit: number | null
-  resetCron: string | null
-}
-
 export type ActivityPeriod = {
   startDate: string
   endDate: string

src/server/db/migrations/20250909_00_add_model_and_temp_to_prompt.ts

@@ -0,0 +1,20 @@
+import { DataTypes } from 'sequelize'
+
+import type { Migration } from '../connection'
+
+export const up: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.addColumn('prompts', 'model', {
+    type: DataTypes.STRING,
+    allowNull: true,
+  })
+
+  await queryInterface.addColumn('prompts', 'temperature', {
+    type: DataTypes.FLOAT,
+    allowNull: true,
+  })
+}
+
+export const down: Migration = async ({ context: queryInterface }) => {
+  await queryInterface.removeColumn('prompts', 'model')
+  await queryInterface.removeColumn('prompts', 'temperature')
+}

src/server/db/models/prompt.ts

@@ -3,6 +3,7 @@ import { type CreationOptional, DataTypes, type InferAttributes, type InferCreat
 import type { CustomMessage } from '../../types'
 import { sequelize } from '../connection'
 import RagIndex from './ragIndex'
+import type { ValidModelName } from '@config'
 
 export const PromptTypeValues = ['CHAT_INSTANCE', 'PERSONAL'] as const
 export type PromptType = (typeof PromptTypeValues)[number]
@@ -28,6 +29,10 @@ class Prompt extends Model<InferAttributes<Prompt>, InferCreationAttributes<Prom
 
   declare mandatory: CreationOptional<boolean>
 
+  declare model?: CreationOptional<ValidModelName>
+
+  declare temperature?: CreationOptional<number>
+
   declare ragIndex?: NonAttribute<RagIndex>
 }
 
@@ -82,6 +87,14 @@ Prompt.init(
       allowNull: false,
       defaultValue: false,
     },
+    model: {
+      type: DataTypes.STRING,
+      allowNull: true,
+    },
+    temperature: {
+      type: DataTypes.FLOAT,
+      allowNull: true,
+    },
   },
   {
     underscored: true,

src/server/routes/prompt.ts

@@ -170,7 +170,7 @@ promptRouter.put('/:id', async (req, res) => {
   const { id } = req.params
   const { user } = req as unknown as RequestWithUser
   const updates = PromptUpdateableParamsSchema.parse(req.body)
-  const { systemMessage, name, hidden, mandatory, ragIndexId } = updates
+  const { systemMessage, name, hidden, mandatory, ragIndexId, model, temperature } = updates
 
   const prompt = await Prompt.findByPk(id)
 
@@ -190,6 +190,8 @@ promptRouter.put('/:id', async (req, res) => {
   prompt.name = name
   prompt.hidden = hidden
   prompt.mandatory = mandatory
+  prompt.model = model
+  prompt.temperature = temperature
 
   await prompt.save()