Merge branch 'main' into cs-6704-error-message-if-fails-to-send

Author: FadhlanR

packages/ai-bot/main.ts

@@ -129,39 +129,46 @@ function getResponse(history: DiscreteMatrixEvent[], aiBotUsername: string) {
   let messages = getModifyPrompt(history, aiBotUsername, functions);
   if (functions.length === 0) {
     return openai.beta.chat.completions.stream({
-      model: 'gpt-4-1106-preview',
+      model: 'gpt-4-turbo',
       messages: messages,
     });
   } else {
     return openai.beta.chat.completions.stream({
-      model: 'gpt-4-1106-preview',
+      model: 'gpt-4-turbo',
       messages: messages,
       functions: functions,
       function_call: 'auto',
     });
   }
 }
 
+function getErrorMessage(error: any): string {
+  if (error instanceof OpenAIError) {
+    return `OpenAI error: ${error.name} - ${error.message}`;
+  }
+  if (typeof error === 'string') {
+    return `Unknown error: ${error}`;
+  }
+  return `Unknown error`;
+}
+
 async function sendError(
   client: MatrixClient,
   room: Room,
   error: any,
   eventToUpdate: string | undefined,
 ) {
-  if (error instanceof OpenAIError) {
-    log.error(`OpenAI error: ${error.name} - ${error.message}`);
-  } else {
-    log.error(`Unknown error: ${error}`);
-  }
   try {
+    let errorMessage = getErrorMessage(error);
+    log.error(errorMessage);
     await sendMessage(
       client,
       room,
       'There was an error processing your request, please try again later',
       eventToUpdate,
       {
         isStreamingFinished: true,
-        errorMessage: error.message,
+        errorMessage,
       },
     );
   } catch (e) {
@@ -227,8 +234,13 @@ async function handleDebugCommands(
       eventBody.split('debug:title:set:')[1],
     );
   } else if (eventBody.startsWith('debug:boom')) {
-    await sendMessage(client, room, `Throwing an unhandled error`, undefined);
-    throw new Error('Boom');
+    await sendError(
+      client,
+      room,
+      `Boom! Throwing an unhandled error`,
+      undefined,
+    );
+    throw new Error('Boom!');
   }
   // Use GPT to set the room title
   else if (eventBody.startsWith('debug:title:create')) {

packages/base/contains-many-component.gts

@@ -46,8 +46,8 @@ class ContainsManyEditor extends GlimmerComponent<Signature> {
               <div class='remove-button-container'>
                 <IconButton
                   @icon={{IconTrash}}
-                  @width='20px'
-                  @height='20px'
+                  @width='18px'
+                  @height='18px'
                   class='remove'
                   {{on 'click' (fn this.remove i)}}
                   data-test-remove={{i}}

packages/base/links-to-many-component.gts

@@ -105,8 +105,8 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
                 <IconButton
                   @variant='primary'
                   @icon={{IconX}}
-                  @width='14px'
-                  @height='14px'
+                  @width='10px'
+                  @height='10px'
                   class='remove-item-button'
                   {{on 'click' (fn this.remove i)}}
                   aria-label='Remove'
@@ -119,8 +119,8 @@ class LinksToManyEditor extends GlimmerComponent<Signature> {
           <AddButton
             class='add-new'
             @variant='pill'
-            @iconWidth='16px'
-            @iconHeight='16px'
+            @iconWidth='12px'
+            @iconHeight='12px'
             {{on 'click' this.add}}
             data-test-add-new
           >