Merge branch 'main' into host/unicode-filenames-cs-6690

Author: backspace

packages/ai-bot/helpers.ts

@@ -171,26 +171,23 @@ export function getRelevantCards(
   return sortedCards;
 }
 
-export function getFunctions(
-  history: DiscreteMatrixEvent[],
-  aiBotUserId: string,
-) {
+export function getTools(history: DiscreteMatrixEvent[], aiBotUserId: string) {
   // Just get the users messages
   const userMessages = history.filter((event) => event.sender !== aiBotUserId);
   // Get the last message
   if (userMessages.length === 0) {
-    // If the user has sent no messages, there are no relevant functions to return
+    // If the user has sent no messages, there are no relevant tools to return
     return [];
   }
   const lastMessage = userMessages[userMessages.length - 1];
   if (
     lastMessage.type === 'm.room.message' &&
     lastMessage.content.msgtype === 'org.boxel.message' &&
-    lastMessage.content.data?.context?.functions
+    lastMessage.content.data?.context?.tools
   ) {
-    return lastMessage.content.data.context.functions;
+    return lastMessage.content.data.context.tools;
   } else {
-    // If it's a different message type, or there are no functions, return an empty array
+    // If it's a different message type, or there are no tools, return an empty array
     return [];
   }
 }
@@ -266,7 +263,7 @@ export function getStartOfConversation(
 export function getModifyPrompt(
   history: DiscreteMatrixEvent[],
   aiBotUserId: string,
-  functions: any[] = [],
+  tools: any[] = [],
 ) {
   // Need to make sure the passed in username is a full id
   if (
@@ -304,7 +301,7 @@ export function getModifyPrompt(
   for (let card of getRelevantCards(history, aiBotUserId)) {
     systemMessage += `Full data: ${JSON.stringify(card)}`;
   }
-  if (functions.length == 0) {
+  if (tools.length == 0) {
     systemMessage +=
       'You are unable to edit any cards, the user has not given you access, they need to open the card on the stack and let it be auto-attached';
   }

packages/ai-bot/main.ts

@@ -13,7 +13,7 @@ import {
   constructHistory,
   getModifyPrompt,
   cleanContent,
-  getFunctions,
+  getTools,
   getStartOfConversation,
   shouldSetRoomTitle,
   type OpenAIPromptMessage,
@@ -98,7 +98,7 @@ async function sendOption(
 ) {
   log.info('sending option', patch);
   const id = patch['card_id'];
-  const body = patch['description'];
+  const body = patch['description'] || "Here's the change:";
   let messageObject = {
     body: body,
     msgtype: 'org.boxel.command',
@@ -126,9 +126,9 @@ async function sendOption(
 }
 
 function getResponse(history: DiscreteMatrixEvent[], aiBotUsername: string) {
-  let functions = getFunctions(history, aiBotUsername);
-  let messages = getModifyPrompt(history, aiBotUsername, functions);
-  if (functions.length === 0) {
+  let tools = getTools(history, aiBotUsername);
+  let messages = getModifyPrompt(history, aiBotUsername, tools);
+  if (tools.length === 0) {
     return openai.beta.chat.completions.stream({
       model: 'gpt-4-turbo',
       messages: messages,
@@ -137,8 +137,8 @@ function getResponse(history: DiscreteMatrixEvent[], aiBotUsername: string) {
     return openai.beta.chat.completions.stream({
       model: 'gpt-4-turbo',
       messages: messages,
-      functions: functions,
-      function_call: 'auto',
+      tools: tools,
+      tool_choice: 'auto',
     });
   }
 }
@@ -374,6 +374,7 @@ Common issues are:
 
       let unsent = 0;
       let sentCommands = 0;
+      let thinkingMessageReplaced = false;
       const runner = getResponse(history, aiBotUserId)
         .on('content', async (_delta, snapshot) => {
           unsent += 1;
@@ -386,37 +387,44 @@ Common issues are:
               initialMessage.event_id,
             );
           }
+          thinkingMessageReplaced = true;
         })
-        .on('functionCall', async (functionCall) => {
-          console.log('Function call', functionCall);
-          let args;
-          try {
-            args = JSON.parse(functionCall.arguments);
-          } catch (error) {
-            Sentry.captureException(error);
-            return await sendError(
-              client,
-              room,
-              error,
-              initialMessage.event_id,
-            );
-          }
-          if (functionCall.name === 'patchCard') {
-            sentCommands += 1;
-            return await sendOption(
-              client,
-              room,
-              args,
-              initialMessage.event_id,
-            );
+        // Messages can have both content and tool calls
+        // We handle tool calls here
+        .on('message', async (msg) => {
+          if (msg.role === 'assistant') {
+            for (const toolCall of msg.tool_calls || []) {
+              const functionCall = toolCall.function;
+              console.log('Function call', toolCall);
+              let args;
+              try {
+                args = JSON.parse(functionCall.arguments);
+              } catch (error) {
+                Sentry.captureException(error);
+                return await sendError(
+                  client,
+                  room,
+                  error,
+                  thinkingMessageReplaced ? undefined : initialMessage.event_id,
+                );
+              }
+              if (functionCall.name === 'patchCard') {
+                sentCommands += 1;
+                await sendOption(
+                  client,
+                  room,
+                  args,
+                  thinkingMessageReplaced ? undefined : initialMessage.event_id,
+                );
+                thinkingMessageReplaced = true;
+              }
+            }
           }
-          return;
         })
         .on('error', async (error: OpenAIError) => {
           Sentry.captureException(error);
           return await sendError(client, room, error, initialMessage.event_id);
         });
-
       // We also need to catch the error when getting the final content
       let finalContent = await runner.finalContent().catch(async (error) => {
         return await sendError(client, room, error, initialMessage.event_id);