use markdown

pyama86 · Aug 27, 2024 · 968a40b · 968a40b
1 parent f22dc03
commit 968a40b
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 34 deletions.
diff --git a/src/mention.test.ts b/src/mention.test.ts
@@ -59,7 +59,8 @@ describe('appMention', () => {
     expect(mockSay).toHaveBeenCalledTimes(1)
     expect(mockSay).toHaveBeenNthCalledWith(1, {
       text: 'GPTの回答',
-      thread_ts: 'test_ts'
+      thread_ts: 'test_ts',
+      type: 'mrkdwn'
     })
   })
 
@@ -98,6 +99,10 @@ describe('appMention', () => {
 
     expect(generateSummary).toHaveBeenCalledWith(
       [
+        {
+          role: 'system',
+          content: [{ text: '応答はマークダウンで行ってください。', type: 'text' }]
+        },
         {
           role: 'user',
           content: [{ text: 'test message 1', type: 'text' }]

diff --git a/src/mention.ts b/src/mention.ts
@@ -20,45 +20,55 @@ export const appMention: any = async ({ event, client, say }) => {
 
     const isSummaryRequest = event.text.includes('今北産業')
 
-    const threadMessages = await Promise.all(
-      replies.messages.map(async (message) => {
-        if (!isSummaryRequest && message.user !== botUserId && !message.text.includes(`<@${botUserId}>`)) {
-          return null
-        }
+    const aiInstructionMessage = {
+      role: 'system',
+      content: [
+        { text: '応答はマークダウンで行ってください。', type: 'text' }
+      ]
+    }
+
+    const threadMessages = [
+      aiInstructionMessage,
+      ...(await Promise.all(
+        replies.messages.map(async (message) => {
+          if (!isSummaryRequest && message.user !== botUserId && !message.text.includes(`<@${botUserId}>`)) {
+            return null
+          }
 
-        const contents = []
+          const contents = []
 
-        if (message.files) {
-          for (const file of message.files) {
-            if ('url_private_download' in file) {
-              const encodedImage = await downloadFileAsBase64(file.url_private_download)
-              let filetype = file.filetype
-              if (filetype === 'jpg') {
-                filetype = 'jpeg'
-              }
+          if (message.files) {
+            for (const file of message.files) {
+              if ('url_private_download' in file) {
+                const encodedImage = await downloadFileAsBase64(file.url_private_download)
+                let filetype = file.filetype
+                if (filetype === 'jpg') {
+                  filetype = 'jpeg'
+                }
 
-              if (encodedImage) {
-                model = 'gpt-4o'
-                max_tokens = 4096
-                contents.push({
-                  image_url: {
-                    url: 'data:image/' + filetype + ';base64,' + encodedImage,
-                    detail: 'auto'
-                  },
-                  type: 'image_url'
-                })
+                if (encodedImage) {
+                  model = 'gpt-4o'
+                  max_tokens = 4096
+                  contents.push({
+                    image_url: {
+                      url: 'data:image/' + filetype + ';base64,' + encodedImage,
+                      detail: 'auto'
+                    },
+                    type: 'image_url'
+                  })
+                }
               }
             }
           }
-        }
 
-        contents.push({ text: (message.text || '').replace(`<@${botUserId}>`, ''), type: 'text' })
-        return {
-          role: message.user === botUserId ? 'assistant' : 'user',
-          content: contents
-        }
-      })
-    )
+          contents.push({ text: (message.text || '').replace(`<@${botUserId}>`, ''), type: 'text' })
+          return {
+            role: message.user === botUserId ? 'assistant' : 'user',
+            content: contents
+          }
+        })
+      ))
+    ]
 
     if (isSummaryRequest) {
       const summary = await generateSummary(threadMessages.filter(nonNullable), model, max_tokens)
@@ -74,7 +84,8 @@ export const appMention: any = async ({ event, client, say }) => {
 
     await say({
       text: gptAnswerText,
-      thread_ts: event.ts
+      thread_ts: event.ts,
+      type: 'mrkdwn'
     })
   } catch (error) {
     console.error(error)