remove model from chat_instances

Author: Veikkosuhonen

src/client/types.ts

@@ -133,11 +133,8 @@ export type ChatInstanceUsage = {
 }
 
 export type UserStatus = {
-  model: ValidModelName
-  models: ValidModelName[]
   usage: number
   limit: number
-  isTike: boolean
 }
 
 export type InfoText = {

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

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

src/server/db/models/chatInstance.ts

@@ -15,8 +15,6 @@ class ChatInstance extends Model<InferAttributes<ChatInstance>, InferCreationAtt
 
   declare description: CreationOptional<string>
 
-  declare model: CreationOptional<string>
-
   declare usageLimit: CreationOptional<number>
 
   declare resetCron: CreationOptional<string | null>
@@ -66,11 +64,6 @@ ChatInstance.init(
       allowNull: false,
       defaultValue: 'No description',
     },
-    model: {
-      type: DataTypes.STRING,
-      allowNull: false,
-      defaultValue: 'gpt-4o',
-    },
     usageLimit: {
       type: DataTypes.INTEGER,
       allowNull: false,

src/server/routes/admin.ts

@@ -10,9 +10,7 @@ import { run as runUpdater } from '../updater'
 import InfoText from '../db/models/infotext'
 import { statsViewerIams } from '../util/config'
 import { generateTerms } from '../util/util'
-import { Where } from 'sequelize/types/utils'
 import { ApplicationError } from '../util/ApplicationError'
-import { ValidModelName } from '../../config'
 
 const adminRouter = express.Router()
 
@@ -31,14 +29,13 @@ adminRouter.use((req, _, next) => {
 interface NewChatInstanceData {
   name: string
   description: string
-  model: ValidModelName
   usageLimit: number
   courseId: string
 }
 
 adminRouter.post('/chatinstances', async (req, res) => {
   const data = req.body as NewChatInstanceData
-  const { name, description, model, usageLimit, courseId } = data
+  const { name, description, usageLimit, courseId } = data
 
   const course = await getCourse(courseId)
   if (!course) {
@@ -48,7 +45,6 @@ adminRouter.post('/chatinstances', async (req, res) => {
   const newChatInstance = await ChatInstance.create({
     name: { en: name, fi: name, sv: name },
     description,
-    model,
     usageLimit,
     courseId,
     activityPeriod: course.activityPeriod,
@@ -162,15 +158,14 @@ adminRouter.get('/statistics', async (req, res) => {
 interface UpdatedChatInstanceData {
   name: string
   description: string
-  model: ValidModelName
   usageLimit: number
   courseId: string
 }
 
 adminRouter.put('/chatinstances/:id', async (req, res) => {
   const { id } = req.params
   const data = req.body as UpdatedChatInstanceData
-  const { description, model, usageLimit, courseId, name } = data
+  const { description, usageLimit, courseId, name } = data
 
   const chatInstance = await ChatInstance.findByPk(id)
 
@@ -180,7 +175,6 @@ adminRouter.put('/chatinstances/:id', async (req, res) => {
 
   chatInstance.name = { en: name, fi: name, sv: name }
   chatInstance.description = description
-  chatInstance.model = model
   chatInstance.usageLimit = usageLimit
   chatInstance.courseId = courseId
 

src/server/routes/ai/v3.ts

@@ -52,20 +52,6 @@ router.post('/stream', upload.single('file'), async (r, res) => {
     throw ApplicationError.Forbidden('Usage limit reached')
   }
 
-  // Check if the model is allowed for the course
-  if (course) {
-    const courseModel = course.model
-
-    if (generationInfo.model) {
-      const allowedModels = getAllowedModels(courseModel)
-      if (!allowedModels.includes(generationInfo.model)) {
-        throw ApplicationError.Forbidden('Model not allowed')
-      }
-    } else {
-      generationInfo.model = courseModel as (typeof validModels)[number]['name']
-    }
-  }
-
   // Check file
   let optionsMessagesWithFile: ChatMessage[] | undefined
 
@@ -140,7 +126,7 @@ router.post('/stream', upload.single('file'), async (r, res) => {
     user,
     chatMessages: options.chatMessages,
     systemMessage,
-    model: generationInfo.model,
+    model: prompt?.model ?? generationInfo.model,
     temperature: options.modelTemperature,
     tools,
     writeEvent: async (event: ChatEvent) => {

src/server/routes/chatInstance.ts

@@ -3,7 +3,7 @@ import { Op } from 'sequelize'
 import { addMonths } from 'date-fns'
 
 import { ChatInstance, User, UserChatInstanceUsage } from '../db/models'
-import { DEFAULT_MODEL_ON_ENABLE, DEFAULT_TOKEN_LIMIT } from '../../config'
+import { DEFAULT_TOKEN_LIMIT } from '../../config'
 import { sequelize } from '../db/connection'
 import { ApplicationError } from '../util/ApplicationError'
 
@@ -102,7 +102,6 @@ chatInstanceRouter.post('/:id/enable', async (req, res) => {
 
   chatInstance.usageLimit = DEFAULT_TOKEN_LIMIT
   chatInstance.activityPeriod = defaultActivityPeriod
-  chatInstance.model = DEFAULT_MODEL_ON_ENABLE
 
   await chatInstance.save()
 

src/server/routes/course.ts

@@ -6,7 +6,6 @@ import { ChatInstance, Enrolment, UserChatInstanceUsage, Prompt, User, Responsib
 import { getOwnCourses } from '../services/chatInstances/access'
 import { encrypt, decrypt } from '../util/util'
 import { ApplicationError } from '../util/ApplicationError'
-import { ValidModelName } from '../../config'
 
 const courseRouter = express.Router()
 
@@ -258,9 +257,8 @@ courseRouter.get('/:id/discussers', checkDiscussionAccess, async (req, res) => {
 
 courseRouter.put('/:id', async (req, res) => {
   const { id } = req.params
-  const { activityPeriod, model, usageLimit, saveDiscussions, notOptoutSaving } = req.body as {
+  const { activityPeriod, usageLimit, saveDiscussions, notOptoutSaving } = req.body as {
     activityPeriod: ActivityPeriod
-    model: ValidModelName
     usageLimit: number
     saveDiscussions: boolean
     notOptoutSaving: boolean
@@ -273,7 +271,6 @@ courseRouter.put('/:id', async (req, res) => {
   if (!chatInstance) throw ApplicationError.NotFound('ChatInstance not found')
 
   chatInstance.activityPeriod = activityPeriod
-  chatInstance.model = model
   chatInstance.usageLimit = usageLimit
   if (saveDiscussions !== undefined) {
     chatInstance.saveDiscussions = saveDiscussions
@@ -295,15 +292,6 @@ const userAssignedAsResponsible = (userId, chatInstance) => {
   return isResponsible
 }
 
-const getUser = async (id: string): Promise<User | null> => {
-  const user = await User.findByPk(id)
-  if (!user) {
-    throw ApplicationError.NotFound('User not found')
-    return null
-  }
-  return user
-}
-
 const getUserByUsername = async (username: string): Promise<User | null> => {
   const user = await User.findOne({
     where: {

src/server/routes/user.ts

@@ -44,7 +44,7 @@ userRouter.get('/login', async (req, res) => {
   // When acual user logs in, update the users info.
   if (!request.hijackedBy) {
     user.lastLoggedInAt = new Date()
-      ;[dbUser] = await User.upsert(user)
+    ;[dbUser] = await User.upsert(user)
   } else {
     dbUser = await User.findByPk(id)
 
@@ -97,13 +97,11 @@ userRouter.get('/status/:courseId', async (req, res) => {
   const request = req as any as RequestWithUser
   const { user } = request
 
-  const { usage, limit, model, models } = await getUserStatus(user, courseId)
+  const { usage, limit } = await getUserStatus(user, courseId)
 
   res.send({
     usage,
     limit,
-    model,
-    models,
   })
   return
 })

src/server/services/chatInstances/usage.ts

@@ -75,8 +75,6 @@ export const incrementCourseUsage = async (chatInstance: ChatInstance, tokenCoun
 }
 
 export const getUserStatus = async (user: UserType, courseId: string) => {
-  const isTike = user.iamGroups.some((iam) => iam.includes(tikeIam))
-
   const chatInstance = await ChatInstance.findOne({
     where: {
       courseId,
@@ -109,9 +107,6 @@ export const getUserStatus = async (user: UserType, courseId: string) => {
     return {
       usage: 0,
       limit: 0,
-      model: '',
-      models: [],
-      isTike,
     }
   }
 
@@ -127,15 +122,8 @@ export const getUserStatus = async (user: UserType, courseId: string) => {
     attributes: ['usageCount'],
   })
 
-  const model = chatInstance.model ?? ''
-
-  const models = getAllowedModels(model)
-
   return {
     usage: chatInstanceUsage?.usageCount ?? 0,
     limit: chatInstance?.usageLimit ?? 0,
-    model,
-    models,
-    isTike,
   }
 }