4.8 preview (#1288)

* Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Newflow (#89) * docs: Add doc for Xinference (#1266) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * rename code * move code * update flow * input type selector * perf: workflow runtime * feat: node adapt newflow * feat: adapt plugin * feat: 360 connection * check workflow * perf: flow 性能 * change plugin input type (#81) * change plugin input type * plugin label mode * perf: nodecard * debug * perf: debug ui * connection ui * change workflow ui (#82) * feat: workflow debug * adapt openAPI for new workflow (#83) * adapt openAPI for new workflow * i18n * perf: plugin debug * plugin input ui * delete * perf: global variable select * fix rebase * perf: workflow performance * feat: input render type icon * input icon * adapt flow (#84) * adapt newflow * temp * temp * fix * feat: app schedule trigger * feat: app schedule trigger * perf: schedule ui * feat: ioslatevm run js code * perf: workflow varialbe table ui * feat: adapt simple mode * feat: adapt input params * output * feat: adapt tamplate * fix: ts * add if-else module (#86) * perf: worker * if else node * perf: tiktoken worker * fix: ts * perf: tiktoken * fix if-else node (#87) * fix if-else node * type * fix * perf: audio render * perf: Parallel worker * log * perf: if else node * adapt plugin * prompt * perf: reference ui * reference ui * handle ux * template ui and plugin tool * adapt v1 workflow * adapt v1 workflow completions * perf: time variables * feat: workflow keyboard shortcuts * adapt v1 workflow * update workflow example doc (#88) * fix: simple mode select tool --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com> * doc * perf: extract node * extra node field * update plugin version * doc * variable * change doc & fix prompt editor (#90) * fold workflow code * value type label --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2025-07-23 21:13:50 +00:00 · 2024-04-25 17:51:20 +08:00
parent b08d81f887
commit 439c819ff1
505 changed files with 23570 additions and 18215 deletions
--- a/packages/service/common/string/markdown.ts
+++ b/packages/service/common/string/markdown.ts
@@ -1,28 +1,9 @@
 import { simpleMarkdownText } from '@fastgpt/global/common/string/markdown';
-import { Worker } from 'worker_threads';
-import { getWorkerPath } from './utils';
+import { WorkerNameEnum, runWorker } from '../../worker/utils';

 /* html string to markdown */
-export const htmlToMarkdown = (html?: string | null) =>
-  new Promise<string>((resolve, reject) => {
-    if (!html) return resolve('');
+export const htmlToMarkdown = async (html?: string | null) => {
+  const md = await runWorker<string>(WorkerNameEnum.htmlStr2Md, { html: html || '' });

-    const start = Date.now();
-
-    // worker
-    const worker = new Worker(getWorkerPath('html2md'));
-
-    worker.on('message', (md: string) => {
-      worker.terminate();
-
-      let rawText = simpleMarkdownText(md);
-
-      resolve(rawText);
-    });
-    worker.on('error', (err) => {
-      worker.terminate();
-      reject(err);
-    });
-
-    worker.postMessage(html);
-  });
+  return simpleMarkdownText(md);
+};
--- a/packages/service/common/string/tiktoken/index.ts
+++ b/packages/service/common/string/tiktoken/index.ts
@@ -0,0 +1,92 @@
+import {
+  ChatCompletionContentPart,
+  ChatCompletionCreateParams,
+  ChatCompletionMessageParam,
+  ChatCompletionTool
+} from '@fastgpt/global/core/ai/type';
+import { chats2GPTMessages } from '@fastgpt/global/core/chat/adapt';
+import { ChatItemType } from '@fastgpt/global/core/chat/type';
+import { WorkerNameEnum, getWorker } from '../../../worker/utils';
+import { ChatCompletionRequestMessageRoleEnum } from '@fastgpt/global/core/ai/constants';
+import { getNanoid } from '@fastgpt/global/common/string/tools';
+import { addLog } from '../../system/log';
+
+export const getTiktokenWorker = () => {
+  if (global.tiktokenWorker) {
+    return global.tiktokenWorker;
+  }
+
+  const worker = getWorker(WorkerNameEnum.countGptMessagesTokens);
+
+  worker.on('message', ({ id, data }: { id: string; data: number }) => {
+    const callback = global.tiktokenWorker?.callbackMap?.[id];
+
+    if (callback) {
+      callback?.(data);
+      delete global.tiktokenWorker.callbackMap[id];
+    }
+  });
+
+  global.tiktokenWorker = {
+    worker,
+    callbackMap: {}
+  };
+
+  return global.tiktokenWorker;
+};
+
+export const countGptMessagesTokens = (
+  messages: ChatCompletionMessageParam[],
+  tools?: ChatCompletionTool[],
+  functionCall?: ChatCompletionCreateParams.Function[]
+) => {
+  return new Promise<number>((resolve) => {
+    const start = Date.now();
+
+    const { worker, callbackMap } = getTiktokenWorker();
+    const id = getNanoid();
+
+    const timer = setTimeout(() => {
+      resolve(0);
+      delete callbackMap[id];
+    }, 300);
+
+    callbackMap[id] = (data) => {
+      resolve(data);
+      clearTimeout(timer);
+
+      // 检测是否有内存泄漏
+      addLog.info(`Count token time: ${Date.now() - start}, token: ${data}`);
+      console.log(Object.keys(global.tiktokenWorker.callbackMap));
+    };
+
+    worker.postMessage({
+      id,
+      messages,
+      tools,
+      functionCall
+    });
+  });
+};
+
+export const countMessagesTokens = (messages: ChatItemType[]) => {
+  const adaptMessages = chats2GPTMessages({ messages, reserveId: true });
+
+  return countGptMessagesTokens(adaptMessages);
+};
+
+/* count one prompt tokens */
+export const countPromptTokens = async (
+  prompt: string | ChatCompletionContentPart[] | null | undefined = '',
+  role: '' | `${ChatCompletionRequestMessageRoleEnum}` = ''
+) => {
+  const total = await countGptMessagesTokens([
+    {
+      //@ts-ignore
+      role,
+      content: prompt
+    }
+  ]);
+
+  return total;
+};
--- a/packages/service/common/string/utils.ts
+++ b/packages/service/common/string/utils.ts
@@ -1,9 +0,0 @@
-export const getWorkerPath = (name: string) => {
-  // @ts-ignore
-  const isSubModule = !!global?.systemConfig;
-
-  const isProd = process.env.NODE_ENV === 'production';
-  return isProd
-    ? `/app/worker/${name}.js`
-    : `../../${isSubModule ? 'FastGPT/' : ''}/worker/${name}.js`;
-};