feat: Insert assistant ID into conversation ✨

Author: lethemanh

packages/cozy-search/src/components/Conversations/ConversationComposer.jsx

@@ -18,6 +18,7 @@ const ConversationComposer = () => {
   const { isMobile } = useBreakpoints()
   const composerRuntime = useComposerRuntime()
   const isRunning = useThread(state => state.isRunning)
+  const isThreadEmpty = useThread(state => state.messages.length === 0)
   const { setOpenedKnowledgePanel } = useAssistant()
 
   const value = useComposer(state => state.text)
@@ -59,7 +60,9 @@ const ConversationComposer = () => {
       />
 
       <div className="u-flex u-flex-items-center u-flex-justify-between u-mt-1">
-        {flag('cozy.create-assistant.enabled') && <AssistantSelection />}
+        {flag('cozy.create-assistant.enabled') && (
+          <AssistantSelection disabled={!isThreadEmpty} />
+        )}
         {flag('cozy.source-knowledge.enabled') && (
           <TwakeKnowledgeSelector
             onSelectTwakeKnowledge={setOpenedKnowledgePanel}

packages/cozy-search/src/components/Conversations/ConversationListItem.jsx

@@ -3,14 +3,13 @@ import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import flag from 'cozy-flags'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import AssistantIcon from 'cozy-ui/transpiled/react/Icons/Assistant'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 
 import ConversationActions from './ConversationActions'
 import styles from './styles.styl'
+import AssistantAvatar from '../Assistant/AssistantAvatar'
 import {
   formatConversationDate,
   getDescriptionOfConversation,
@@ -62,7 +61,11 @@ const ConversationListItem = ({
               variant="h6"
               className="u-flex u-flex-items-center u-coolGrey"
             >
-              <Icon icon={AssistantIcon} className="u-mr-half" />
+              <AssistantAvatar
+                assistant={conversation.assistant}
+                className="u-mr-half"
+                isSmall
+              />
               {formatConversationDate(
                 conversation.cozyMetadata?.updatedAt,
                 t,

packages/cozy-search/src/components/Conversations/ConversationListItemWider.jsx

@@ -3,15 +3,14 @@ import React from 'react'
 import { useI18n } from 'twake-i18n'
 
 import flag from 'cozy-flags'
-import Icon from 'cozy-ui/transpiled/react/Icon'
-import ImageIcon from 'cozy-ui/transpiled/react/Icons/Image'
 import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import Typography from 'cozy-ui/transpiled/react/Typography'
 
 import ConversationActions from './ConversationActions'
 import styles from './styles.styl'
+import AssistantAvatar from '../Assistant/AssistantAvatar'
 import {
   formatConversationDate,
   getDescriptionOfConversation,
@@ -39,7 +38,11 @@ const ConversationListItemWider = ({
       selected={selected}
     >
       <ListItemIcon>
-        <Icon icon={ImageIcon} />
+        <AssistantAvatar
+          assistant={conversation.assistant}
+          className="u-mr-half"
+          isSmall
+        />
       </ListItemIcon>
       <ListItemText
         primary={

packages/cozy-search/src/components/CozyAssistantRuntimeProvider.tsx

@@ -34,6 +34,8 @@ import {
   CHAT_CONVERSATIONS_DOCTYPE,
   buildChatConversationQueryById
 } from './queries'
+import { useAssistant } from './AssistantProvider'
+import { DEFAULT_ASSISTANT } from './constants'
 
 interface ConversationMessage {
   id: string
@@ -45,6 +47,7 @@ interface ConversationMessage {
 interface Conversation {
   _id: string
   messages?: ConversationMessage[]
+  assistant_id?: string
 }
 
 interface CozyAssistantRuntimeProviderProps {
@@ -73,6 +76,7 @@ const ConversationLoader = ({
 }: CozyAssistantRuntimeProviderProps & {
   conversationId: string
 }): JSX.Element | null => {
+  const { setSelectedAssistantId } = useAssistant()
   const conversationQuery = buildChatConversationQueryById(conversationId)
   const queryResult = useQuery(
     conversationQuery.definition,
@@ -86,6 +90,10 @@ const ConversationLoader = ({
     [conversation?.messages]
   )
 
+  useEffect(() => {
+    setSelectedAssistantId(conversation?.assistant_id || DEFAULT_ASSISTANT.id)
+  }, [conversation?.assistant_id, setSelectedAssistantId])
+
   if (isLoading) {
     return (
       <div className="u-flex u-flex-items-center u-flex-justify-center u-h-100 u-w-100">
@@ -119,6 +127,11 @@ const CozyAssistantRuntimeProviderInner = ({
   const messagesIdRef = useRef<string[]>([])
   const cancelledMessageIdsRef = useRef<Set<string>>(new Set())
   const currentStreamingMessageIdRef = useRef<string | null>(null)
+  const { selectedAssistantId } = useAssistant()
+
+  useEffect(() => {
+    cancelledMessageIdsRef.current.clear()
+  }, [conversationId])
 
   useEffect(() => {
     messagesIdRef.current = initialMessages
@@ -223,11 +236,12 @@ const CozyAssistantRuntimeProviderInner = ({
             typeof createCozyRealtimeChatAdapter
           >[0]['client'],
           conversationId,
-          streamBridge: streamBridgeRef.current
+          streamBridge: streamBridgeRef.current,
+          assistantId: selectedAssistantId
         },
         t
       ),
-    [client, conversationId, t]
+    [client, conversationId, selectedAssistantId, t]
   )
 
   const runtime = useLocalRuntime(adapter, {

packages/cozy-search/src/components/adapters/CozyRealtimeChatAdapter.ts

@@ -31,6 +31,7 @@ export interface CozyRealtimeChatAdapterOptions {
   client: CozyClient
   conversationId: string
   streamBridge: StreamBridge
+  assistantId?: string
 }
 
 /**
@@ -66,7 +67,7 @@ export const createCozyRealtimeChatAdapter = (
     messages,
     abortSignal
   }: ChatModelRunOptions): AsyncGenerator<ChatModelRunResult> {
-    const { client, conversationId, streamBridge } = options
+    const { client, conversationId, streamBridge, assistantId } = options
 
     const userQuery = findUserQuery(messages)
     if (!userQuery) {
@@ -81,7 +82,7 @@ export const createCozyRealtimeChatAdapter = (
       await client.stackClient.fetchJSON(
         'POST',
         `/ai/chat/conversations/${conversationId}`,
-        { q: userQuery }
+        { q: userQuery, assistantId }
       )
 
       let fullText = ''

packages/cozy-search/src/components/queries.js

@@ -71,6 +71,7 @@ export const buildChatConversationsQuery = () => {
         .where({})
         .indexFields(['cozyMetadata.updatedAt'])
         .sortBy([{ 'cozyMetadata.updatedAt': 'desc' }])
+        .include(['assistant'])
         .limitBy(50),
     options: {
       as: CHAT_CONVERSATIONS_DOCTYPE + '/recent',