Merge branch 'josStorer:master' into master

josStorer · Jul 27, 2023 · 09ccc96 · 09ccc96
2 parents 627bd63 + 819eb16
commit 09ccc96
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 8 deletions.
diff --git a/src/config/index.mjs b/src/config/index.mjs
@@ -35,8 +35,11 @@ export const chatgptApiModelKeys = [
   'chatgptApi35',
   'chatgptApi35_16k',
   'chatgptApi35_0613',
+  'chatgptApi35_16k_0613',
   'chatgptApi4_8k',
+  'chatgptApi4_8k_0613',
   'chatgptApi4_32k',
+  'chatgptApi4_32k_0613',
 ]
 export const customApiModelKeys = ['customModel']
 export const azureOpenAiApiModelKeys = ['azureOpenAi']
@@ -71,18 +74,24 @@ export const Models = {
   chatgptApi35: { value: 'gpt-3.5-turbo', desc: 'ChatGPT (GPT-3.5-turbo)' },
   chatgptApi35_16k: { value: 'gpt-3.5-turbo-16k', desc: 'ChatGPT (GPT-3.5-turbo-16k)' },
   chatgptApi35_0613: { value: 'gpt-3.5-turbo-0613', desc: 'ChatGPT (GPT-3.5-turbo 0613)' },
+  chatgptApi35_16k_0613: {
+    value: 'gpt-3.5-turbo-16k-0613',
+    desc: 'ChatGPT (GPT-3.5-turbo-16k 0613)',
+  },
   bingFree4: { value: '', desc: 'Bing (Web, GPT-4)' },
   bingFreeSydney: { value: '', desc: 'Bing (Web, GPT-4, Sydney)' },
   bardWebFree: { value: '', desc: 'Bard (Web)' },
-  poeAiWebSage: { value: 'sage', desc: 'Poe AI (Web, Sage)' },
+  poeAiWebSage: { value: 'Assistant', desc: 'Poe AI (Web, Assistant)' },
   poeAiWebGPT4: { value: 'gpt-4', desc: 'Poe AI (Web, GPT-4)' },
   poeAiWebGPT4_32k: { value: 'gpt-4-32k', desc: 'Poe AI (Web, GPT-4-32k)' },
   poeAiWebClaudePlus: { value: 'claude-2-100k', desc: 'Poe AI (Web, Claude 2 100k)' },
   poeAiWebClaude: { value: 'claude-instant', desc: 'Poe AI (Web, Claude instant)' },
   poeAiWebClaude100k: { value: 'claude-instant-100k', desc: 'Poe AI (Web, Claude instant 100k)' },
   poeAiWebGooglePaLM: { value: 'Google-PaLM', desc: 'Poe AI (Web, Google-PaLM)' },
   chatgptApi4_8k: { value: 'gpt-4', desc: 'ChatGPT (GPT-4-8k)' },
+  chatgptApi4_8k_0613: { value: 'gpt-4', desc: 'ChatGPT (GPT-4-8k 0613)' },
   chatgptApi4_32k: { value: 'gpt-4-32k', desc: 'ChatGPT (GPT-4-32k)' },
+  chatgptApi4_32k_0613: { value: 'gpt-4-32k', desc: 'ChatGPT (GPT-4-32k 0613)' },
   gptApiDavinci: { value: 'text-davinci-003', desc: 'GPT-3.5' },
   customModel: { value: '', desc: 'Custom Model' },
   azureOpenAi: { value: '', desc: 'ChatGPT (Azure)' },
@@ -188,6 +197,7 @@ export const defaultConfig = {
     'stackoverflow',
     'juejin',
     'mp.weixin.qq',
+    'followin',
   ],
   accessToken: '',
   tokenSavedOn: 0,
@@ -233,6 +243,7 @@ export const defaultConfig = {
     'stackoverflow',
     'juejin',
     'mp.weixin.qq',
+    'followin',
   ],
 }
 

diff --git a/src/content-script/site-adapters/followin/index.mjs b/src/content-script/site-adapters/followin/index.mjs
@@ -0,0 +1,28 @@
+import { cropText } from '../../../utils'
+
+export default {
+  inputQuery: async () => {
+    try {
+      const author = document.querySelector('main article a > span')?.textContent
+      const description =
+        document.querySelector('#article-content')?.textContent ||
+        document.querySelector('#thead-gallery')?.textContent
+      if (author && description) {
+        const title = document.querySelector('main article h1')?.textContent
+        if (title) {
+          return await cropText(
+            `以下是一篇文章,请给出文章的结论和3到5个要点.标题是:"${title}",作者是:"${author}",内容是:\n"${description}".
+          `,
+          )
+        } else {
+          return await cropText(
+            `以下是一篇长推文,请给出文章的结论和3到5个要点.作者是:"${author}",内容是:\n"${description}".
+          `,
+          )
+        }
+      }
+    } catch (e) {
+      console.log(e)
+    }
+  },
+}
diff --git a/src/content-script/site-adapters/index.mjs b/src/content-script/site-adapters/index.mjs
@@ -9,6 +9,7 @@ import quora from './quora'
 import stackoverflow from './stackoverflow'
 import juejin from './juejin'
 import weixin from './weixin'
+import followin from './followin'
 
 /**
  * @typedef {object} SiteConfigAction
@@ -185,4 +186,10 @@ export const config = {
     appendContainerQuery: [],
     resultsContainerQuery: ['#js_content'],
   },
+  followin: {
+    inputQuery: followin.inputQuery,
+    sidebarContainerQuery: [],
+    appendContainerQuery: [],
+    resultsContainerQuery: ['#article-content', '#thead-gallery'],
+  },
 }
diff --git a/src/content-script/styles.scss b/src/content-script/styles.scss
@@ -3,6 +3,7 @@
 
 [data-theme='auto'] {
   @import 'github-markdown-css/github-markdown.css';
+
   @media screen and (prefers-color-scheme: dark) {
     @import 'highlight.js/scss/github-dark.scss';
     --font-color: #c9d1d9;
@@ -13,6 +14,7 @@
     --color-neutral-muted: rgba(110, 118, 129, 0.4);
     --code-background-color: rgb(13, 17, 23);
   }
+
   @media screen and (prefers-color-scheme: light) {
     @import 'highlight.js/scss/github.scss';
     --font-color: #24292f;
@@ -98,26 +100,32 @@
       background-color: var(--theme-color);
       width: 9px;
     }
+
     ::-webkit-scrollbar-thumb {
       background-color: var(--theme-border-color);
       border-radius: 20px;
       border: transparent;
     }
+
     ::-webkit-scrollbar-corner {
       background: transparent;
     }
+
     &::-webkit-scrollbar {
       background-color: var(--theme-color);
       width: 9px;
     }
+
     &::-webkit-scrollbar-thumb {
       background-color: var(--theme-border-color);
       border-radius: 20px;
       border: transparent;
     }
+
     &::-webkit-scrollbar-corner {
       background: transparent;
     }
+
     p {
       color: var(--font-color);
     }
@@ -133,6 +141,7 @@
 
       li {
         counter-increment: item;
+        margin-bottom: 0px;
 
         &::marker {
           content: counter(item) '. ';
@@ -288,11 +297,13 @@
       background-color: var(--theme-color);
       width: 9px;
     }
+
     &::-webkit-scrollbar-thumb {
       background-color: var(--theme-border-color);
       border-radius: 20px;
       border: transparent;
     }
+
     &::-webkit-scrollbar-corner {
       background: transparent;
     }

diff --git a/src/services/apis/azure-openai-api.mjs b/src/services/apis/azure-openai-api.mjs
@@ -59,6 +59,7 @@ export async function generateAnswersWithAzureOpenaiApi(port, question, session)
       },
       async onStart() {},
       async onEnd() {
+        port.postMessage({ done: true })
         port.onMessage.removeListener(messageListener)
         port.onDisconnect.removeListener(disconnectListener)
       },

diff --git a/src/services/apis/chatgpt-web.mjs b/src/services/apis/chatgpt-web.mjs
@@ -123,7 +123,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
     }),
     onMessage(message) {
       console.debug('sse message', message)
-      if (message === '[DONE]') {
+      if (message.trim() === '[DONE]') {
         pushRecord(session, question, answer)
         console.debug('conversation history', { content: session.conversationRecords })
         port.postMessage({ answer: null, done: true, session: session })
@@ -148,6 +148,7 @@ export async function generateAnswersWithChatgptWebApi(port, question, session,
       // sendModerations(accessToken, question, session.conversationId, session.messageId)
     },
     async onEnd() {
+      port.postMessage({ done: true })
       port.onMessage.removeListener(messageListener)
       port.onDisconnect.removeListener(disconnectListener)
     },

diff --git a/src/services/apis/custom-api.mjs b/src/services/apis/custom-api.mjs
@@ -47,7 +47,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
     }),
     onMessage(message) {
       console.debug('sse message', message)
-      if (message === '[DONE]') {
+      if (message.trim() === '[DONE]') {
         pushRecord(session, question, answer)
         console.debug('conversation history', { content: session.conversationRecords })
         port.postMessage({ answer: null, done: true, session: session })
@@ -72,6 +72,7 @@ export async function generateAnswersWithCustomApi(port, question, session, apiK
     },
     async onStart() {},
     async onEnd() {
+      port.postMessage({ done: true })
       port.onMessage.removeListener(messageListener)
       port.onDisconnect.removeListener(disconnectListener)
     },

diff --git a/src/services/apis/openai-api.mjs b/src/services/apis/openai-api.mjs
@@ -55,7 +55,7 @@ export async function generateAnswersWithGptCompletionApi(
     }),
     onMessage(message) {
       console.debug('sse message', message)
-      if (message === '[DONE]') {
+      if (message.trim() === '[DONE]') {
         pushRecord(session, question, answer)
         console.debug('conversation history', { content: session.conversationRecords })
         port.postMessage({ answer: null, done: true, session: session })
@@ -73,6 +73,7 @@ export async function generateAnswersWithGptCompletionApi(
     },
     async onStart() {},
     async onEnd() {
+      port.postMessage({ done: true })
       port.onMessage.removeListener(messageListener)
       port.onDisconnect.removeListener(disconnectListener)
     },
@@ -122,7 +123,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
     }),
     onMessage(message) {
       console.debug('sse message', message)
-      if (message === '[DONE]') {
+      if (message.trim() === '[DONE]') {
         pushRecord(session, question, answer)
         console.debug('conversation history', { content: session.conversationRecords })
         port.postMessage({ answer: null, done: true, session: session })
@@ -144,6 +145,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
     },
     async onStart() {},
     async onEnd() {
+      port.postMessage({ done: true })
       port.onMessage.removeListener(messageListener)
       port.onDisconnect.removeListener(disconnectListener)
     },

diff --git a/src/services/apis/waylaidwanderer-api.mjs b/src/services/apis/waylaidwanderer-api.mjs
@@ -36,7 +36,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess
     }),
     onMessage(message) {
       console.debug('sse message', message)
-      if (message === '[DONE]') {
+      if (message.trim() === '[DONE]') {
         pushRecord(session, question, answer)
         console.debug('conversation history', { content: session.conversationRecords })
         port.postMessage({ answer: null, done: true, session: session })
@@ -64,6 +64,7 @@ export async function generateAnswersWithWaylaidwandererApi(port, question, sess
     },
     async onStart() {},
     async onEnd() {
+      port.postMessage({ done: true })
       port.onMessage.removeListener(messageListener)
       port.onDisconnect.removeListener(disconnectListener)
     },

diff --git a/src/services/clients/poe/index.mjs b/src/services/clients/poe/index.mjs
@@ -31,7 +31,7 @@ export default class PoeAiClient {
       await this.getCredentials()
     }
     if (!this.bot) {
-      await this.initBot(model || 'sage')
+      await this.initBot(model || 'Assistant')
     }
     if (!this.chatId) {
       await this.getChatId(this.bot)
@@ -131,7 +131,7 @@ export default class PoeAiClient {
   }
 
   async initBot(bot) {
-    if (bot === 'sage') {
+    if (bot === 'Assistant') {
       bot = 'capybara'
     } else if (bot === 'gpt-4') {
       bot = 'beaver'