experimental: Show model + prompt name over the message

Veikkosuhonen · Veikkosuhonen · commit d1aeaf1e2763 · 2025-09-03T19:13:04.000+03:00
diff --git a/e2e/prompts.spec.ts b/e2e/prompts.spec.ts
@@ -48,7 +48,7 @@ test.describe('Prompts', () => {
     await expect(page.getByTestId('assistant-instructions-input')).toContainText('mocktest testi onnistui')
   })
 
-  test('Course prompt creation, chat link with prompt, and deletion', async ({ page }) => {
+  test.only('Course prompt creation, chat link with prompt, and deletion', async ({ page }) => {
     await page.goto('/courses/test-course/prompts')
 
     const newPromptName = `testausprompti-${test.info().workerIndex}`
@@ -98,7 +98,7 @@ test.describe('Prompts', () => {
     await page.getByTestId('prompt-selector-button').click()
 
     // Prompt is not visible anymore in student view.
-    expect(page.getByText(newPromptName)).not.toBeVisible()
+    expect(page.getByText(newPromptName, { exact: true })).not.toBeVisible()
   })
 
   test('Own prompts work in course chat and normal chat', async ({ page }) => {
diff --git a/src/client/components/ChatV2/ChatV2.tsx b/src/client/components/ChatV2/ChatV2.tsx
@@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useParams, useSearchParams } from 'react-router-dom'
 import { DEFAULT_ASSISTANT_INSTRUCTIONS, DEFAULT_MODEL, DEFAULT_MODEL_TEMPERATURE, FREE_MODEL, inProduction, validModels } from '../../../config'
-import type { ChatMessage, ToolCallResultEvent } from '../../../shared/chat'
+import type { ChatMessage, MessageGenerationInfo, ToolCallResultEvent } from '../../../shared/chat'
 import type { RagIndexAttributes } from '../../../shared/types'
 import { getLanguageValue } from '../../../shared/utils'
 import { useIsEmbedded } from '../../contexts/EmbeddedContext'
@@ -127,7 +127,7 @@ export const ChatV2 = () => {
 
   const disclaimerInfo = infoTexts?.find((infoText) => infoText.name === 'disclaimer')?.text[i18n.language] ?? null
 
-  const { processStream, completion, isStreaming, setIsStreaming, toolCalls, streamController } = useChatStream({
+  const { processStream, completion, isStreaming, setIsStreaming, toolCalls, streamController, generationInfo } = useChatStream({
     onComplete: ({ message }) => {
       if (message.content.length > 0) {
         setMessages((prev: ChatMessage[]) => prev.concat(message))
@@ -188,12 +188,18 @@ export const ChatV2 = () => {
     setIsStreaming(true)
     chatScroll.beginAutoscroll()
 
+    const generationInfo: MessageGenerationInfo = {
+      model: activeModel,
+      promptInfo: activePrompt
+        ? { id: activePrompt.id, name: activePrompt.name, type: 'saved', systemMessage: activePrompt.systemMessage }
+        : { type: 'custom', systemMessage: customSystemMessage },
+    }
+
     try {
       const { tokenUsageAnalysis, stream } = await getCompletionStreamV3({
-        systemMessage: activePrompt?.systemMessage || customSystemMessage,
+        generationInfo,
         messages: newMessages,
         ragIndexId,
-        model: activeModel,
         formData,
         modelTemperature: parseFloat(modelTemperature),
         courseId,
@@ -219,7 +225,7 @@ export const ChatV2 = () => {
 
       clearRetryTimeout()
       if (stream) {
-        await processStream(stream)
+        await processStream(stream, generationInfo)
       }
     } catch (err: any) {
       console.error(err)
@@ -475,6 +481,7 @@ export const ChatV2 = () => {
             initial={<ConversationSplash courseName={course && getLanguageValue(course.name, i18n.language)} courseDate={course?.activityPeriod} />}
             messages={messages}
             completion={completion}
+            generationInfo={generationInfo}
             isStreaming={isStreaming}
             toolCalls={toolCalls}
             setActiveToolResult={setActiveToolResult}
diff --git a/src/client/components/ChatV2/Conversation.tsx b/src/client/components/ChatV2/Conversation.tsx
@@ -15,10 +15,11 @@ import { t } from 'i18next'
 import FormatQuoteIcon from '@mui/icons-material/FormatQuote'
 import useLocalStorageState from '../../hooks/useLocalStorageState'
 import { BlueButton } from './general/Buttons'
-import type { ChatMessage, ToolCallResultEvent, ToolCallStatusEvent } from '../../../shared/chat'
+import type { AssistantMessage, ChatMessage, MessageGenerationInfo, ToolCallResultEvent, ToolCallStatusEvent, UserMessage } from '../../../shared/chat'
 import { useId, useMemo } from 'react'
+import { ArrowRight } from '@mui/icons-material'
 
-const UserMessage = ({ content, attachments }: { content: string; attachments?: string }) => (
+const UserMessageItem = ({ message }: { message: UserMessage }) => (
   <Box
     sx={{
       backgroundColor: '#efefef',
@@ -33,9 +34,9 @@ const UserMessage = ({ content, attachments }: { content: string; attachments?:
       width: 'fit-content',
     }}
   >
-    {content}
+    {message.content}
 
-    {attachments && (
+    {message.attachments && (
       <Typography
         variant="body2"
         sx={{
@@ -47,7 +48,7 @@ const UserMessage = ({ content, attachments }: { content: string; attachments?:
         }}
       >
         <AttachFileIcon fontSize="small" />
-        {attachments}
+        {message.attachments}
       </Typography>
     )}
   </Box>
@@ -102,18 +103,24 @@ const ToolResult = ({ toolResult, handleToolResult }: { toolResult: ToolCallResu
   )
 }
 
-const AssistantMessage = ({
-  content,
-  error,
-  toolResults,
-  setActiveToolResult,
-}: {
-  content: string
-  error?: string
-  toolResults?: Record<string, ToolCallResultEvent>
-  setActiveToolResult: (data: ToolCallResultEvent) => void
-}) => {
-  const processedContent = preprocessMath(content)
+const AssistantMessageInfo = ({ message }: { message: AssistantMessage }) => {
+  if (!message.generationInfo) return null
+
+  const title =
+    message.generationInfo.promptInfo.type === 'saved'
+      ? `${message.generationInfo.promptInfo.name} (${message.generationInfo.model})`
+      : `${message.generationInfo.model}`
+
+  return (
+    <Box sx={{ display: 'flex', opacity: 0.7, alignItems: 'center' }}>
+      <ArrowRight fontSize="small" />
+      <Typography fontSize="small">{title}</Typography>
+    </Box>
+  )
+}
+
+const AssistantMessageItem = ({ message, setActiveToolResult }: { message: AssistantMessage; setActiveToolResult: (data: ToolCallResultEvent) => void }) => {
+  const processedContent = preprocessMath(message.content)
   const katexOptions = {
     macros: {
       '\\abs': '\\left|#1\\right|',
@@ -185,8 +192,9 @@ const AssistantMessage = ({
           borderRadius: 4,
         }}
       >
-        <CopyToClipboardButton id={msgId} copied={content} />
+        <CopyToClipboardButton id={msgId} copied={message.content} />
       </Box>
+      <AssistantMessageInfo message={message} />
       <ReactMarkdown
         remarkPlugins={[remarkGfm, [remarkMath, { singleDollarTextMath: false }]]}
         rehypePlugins={[[rehypeKatex, katexOptions]]}
@@ -255,12 +263,12 @@ const AssistantMessage = ({
       >
         {processedContent}
       </ReactMarkdown>
-      {error && (
+      {message.error && (
         <Box>
-          <Typography variant="body1" fontStyle="italic" color="#cc0000">{`\n\n ${error}`}</Typography>
+          <Typography variant="body1" fontStyle="italic" color="#cc0000">{`\n\n ${message.error}`}</Typography>
         </Box>
       )}
-      {Object.values(toolResults ?? {}).map((toolResult) => (
+      {Object.values(message.toolCalls ?? {}).map((toolResult) => (
         <ToolResult key={toolResult.callId} toolResult={toolResult} handleToolResult={handleToolResult} />
       ))}
     </Box>
@@ -276,13 +284,13 @@ export const MessageItem = ({ message, setActiveToolResult }: { message: ChatMes
           height: 'auto',
         }}
       >
-        <AssistantMessage content={message.content} error={message.error} toolResults={message.toolCalls} setActiveToolResult={setActiveToolResult} />
+        <AssistantMessageItem message={message} setActiveToolResult={setActiveToolResult} />
       </Box>
     )
   } else {
     return (
       <Box data-sentry-mask data-testid="user-message" sx={{ alignSelf: 'flex-end' }}>
-        <UserMessage content={message.content} attachments={message.attachments ?? ''} />
+        <UserMessageItem message={message} />
       </Box>
     )
   }
@@ -291,13 +299,15 @@ export const MessageItem = ({ message, setActiveToolResult }: { message: ChatMes
 export const Conversation = ({
   messages,
   completion,
+  generationInfo,
   toolCalls,
   isStreaming,
   setActiveToolResult,
   initial,
 }: {
   messages: ChatMessage[]
   completion: string
+  generationInfo?: MessageGenerationInfo
   toolCalls: { [callId: string]: ToolCallStatusEvent }
   isStreaming: boolean
   setActiveToolResult: (data: ToolCallResultEvent) => void
@@ -326,7 +336,7 @@ export const Conversation = ({
         {isStreaming &&
           messages.length > 0 &&
           (completion.length > 0 ? (
-            <MessageItem message={{ role: 'assistant', content: completion }} setActiveToolResult={setActiveToolResult} />
+            <MessageItem message={{ role: 'assistant', content: completion, generationInfo }} setActiveToolResult={setActiveToolResult} />
           ) : (
             <LoadingMessage toolCalls={toolCalls} />
           ))}
diff --git a/src/client/components/ChatV2/useChatStream.ts b/src/client/components/ChatV2/useChatStream.ts
@@ -1,5 +1,5 @@
 import { useState } from 'react'
-import type { AssistantMessage, ChatEvent, ToolCallResultEvent, ToolCallStatusEvent } from '../../../shared/chat'
+import type { AssistantMessage, ChatEvent, MessageGenerationInfo, ToolCallResultEvent, ToolCallStatusEvent } from '../../../shared/chat'
 
 type ToolCallState = ToolCallStatusEvent
 
@@ -15,16 +15,18 @@ export const useChatStream = ({
   onText: () => void
 }) => {
   const [completion, setCompletion] = useState('')
+  const [generationInfo, setGenerationInfo] = useState<MessageGenerationInfo | undefined>()
   const [isStreaming, setIsStreaming] = useState(false)
   const [toolCalls, setToolCalls] = useState<Record<string, ToolCallState>>({})
   const [streamController, setStreamController] = useState<AbortController>()
 
   const decoder = new TextDecoder()
 
-  const processStream = async (stream: ReadableStream) => {
+  const processStream = async (stream: ReadableStream, baseGenerationInfo: MessageGenerationInfo) => {
     let content = ''
     let error = ''
     const toolCallResultsAccum: Record<string, ToolCallResultEvent> = {}
+    setGenerationInfo(baseGenerationInfo)
 
     try {
       const reader = stream.getReader()
@@ -90,13 +92,15 @@ export const useChatStream = ({
       setCompletion('')
       setToolCalls({})
       setIsStreaming(false)
+      setGenerationInfo(undefined)
 
       onComplete({
         message: {
           role: 'assistant',
           content,
           error: error.length > 0 ? error : undefined,
           toolCalls: toolCallResultsAccum,
+          generationInfo: baseGenerationInfo,
         },
       })
     }
@@ -105,6 +109,7 @@ export const useChatStream = ({
   return {
     processStream,
     completion,
+    generationInfo,
     isStreaming,
     setIsStreaming,
     toolCalls,
diff --git a/src/client/components/ChatV2/util.ts b/src/client/components/ChatV2/util.ts
@@ -1,11 +1,10 @@
-import type { ChatMessage } from '../../../shared/chat'
+import type { ChatMessage, MessageGenerationInfo } from '../../../shared/chat'
 import { postAbortableStream } from '../../util/apiClient'
 
 interface GetCompletionStreamProps {
+  generationInfo: MessageGenerationInfo
   courseId?: string
-  systemMessage: string
   messages: ChatMessage[]
-  model: string
   formData: FormData
   ragIndexId?: number
   userConsent?: boolean
@@ -15,10 +14,9 @@ interface GetCompletionStreamProps {
   saveConsent: boolean
 }
 export const getCompletionStreamV3 = async ({
+  generationInfo,
   courseId,
-  systemMessage,
   messages,
-  model,
   formData,
   ragIndexId,
   userConsent,
@@ -31,9 +29,9 @@ export const getCompletionStreamV3 = async ({
     courseId,
     options: {
       chatMessages: messages,
-      systemMessage,
+      systemMessage: generationInfo.promptInfo.systemMessage,
+      model: generationInfo.model,
       ragIndexId,
-      model,
       userConsent,
       modelTemperature,
       saveConsent,
diff --git a/src/server/routes/ai/v3.ts b/src/server/routes/ai/v3.ts
@@ -187,8 +187,6 @@ router.post('/stream', upload.single('file'), async (r, res) => {
     tokensPerSecond: result.tokensPerSecond,
   }
 
-  logger.info(`Stream ended. Total tokens: ${tokenCount}`, chatCompletionMeta)
-
   res.locals.chatCompletionMeta = chatCompletionMeta
 
   // If course has saveDiscussion turned on and user has consented to saving the discussion, save the discussion
diff --git a/src/server/util/pate.ts b/src/server/util/pate.ts
@@ -29,8 +29,8 @@ const sendEmail = async (targets: string[], text: string, subject: string) => {
 
   logger.info(`Sending email with payload size ${payloadSizeKb.toFixed(2)} KB`)
 
-  if (inCI) {
-    logger.info('Skipping email sending in CI')
+  if (inCI || inDevelopment) {
+    logger.info('Skipping email sending in CI or development')
     return
   }
 
diff --git a/src/shared/chat.ts b/src/shared/chat.ts
@@ -44,7 +44,7 @@ export type AssistantMessage = {
   content: string
   error?: string
   toolCalls?: Record<string, ToolCallResultEvent>
-  promptInfo?: MessagePromptInfo
+  generationInfo?: MessageGenerationInfo
 }
 
 export type Message = SystemMessage | UserMessage | AssistantMessage
@@ -55,14 +55,17 @@ export type ChatMessage = UserMessage | AssistantMessage
 
 export type ChatRole = ChatMessage['role']
 
-export type MessagePromptInfo =
-  | {
-      type: 'saved'
-      id: string
-      name: string
-      systemMessage?: string
-    }
-  | {
-      type: 'custom'
-      systemMessage: string
-    }
+export type MessageGenerationInfo = {
+  model: string
+  promptInfo:
+    | {
+        type: 'saved'
+        id: string
+        name: string
+        systemMessage: string
+      }
+    | {
+        type: 'custom'
+        systemMessage: string
+      }
+}

Original file line number	Diff line number	Diff line change
`@@ -187,8 +187,6 @@ router.post('/stream', upload.single('file'), async (r, res) => {`
`187`	`187`	`tokensPerSecond: result.tokensPerSecond,`
`188`	`188`	`}`
`189`	`189`
`190`		- logger.info(`Stream ended. Total tokens: ${tokenCount}`, chatCompletionMeta)
`191`		`-`
`192`	`190`	`res.locals.chatCompletionMeta = chatCompletionMeta`
`193`	`191`
`194`	`192`	`// If course has saveDiscussion turned on and user has consented to saving the discussion, save the discussion`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ const sendEmail = async (targets: string[], text: string, subject: string) => {`
`29`	`29`
`30`	`30`	logger.info(`Sending email with payload size ${payloadSizeKb.toFixed(2)} KB`)
`31`	`31`
`32`		`- if (inCI) {`
`33`		`- logger.info('Skipping email sending in CI')`
	`32`	`+ if (inCI \|\| inDevelopment) {`
	`33`	`+ logger.info('Skipping email sending in CI or development')`
`34`	`34`	`return`
`35`	`35`	`}`
`36`	`36`