plan count and replace invalid chars (#29)

* fix: user oneapi * fix: training queue * fix: qa queue * perf: remove space chars * replace invalid chars
labring · Feb 27, 2024 · fe9dd36 · fe9dd36
1 parent 964edba
commit fe9dd36
Show file tree

Hide file tree

Showing 18 changed files with 41 additions and 473 deletions.
diff --git a/docSite/content/docs/development/upgrading/469.md b/docSite/content/docs/development/upgrading/469.md
@@ -27,3 +27,4 @@ curl --location --request POST 'https://{{host}}/api/init/v469' \
 3. 优化 - 问题补全。增加英文类型。同时可以设置为单独模块，方便复用。
 4. 优化 - 重写了计量模式
 5. 修复 - 标注功能。
+6. 修复 - qa生成线程计数错误。
diff --git a/docSite/content/docs/workflow/examples/dalle3.md b/docSite/content/docs/workflow/examples/dalle3.md
@@ -66,7 +66,7 @@ Body:
 
 Headers:
 
-`Authorization: sk-xxx`
+`Authorization: Bearer sk-xxx`
 
 Response:
 

diff --git a/packages/global/core/ai/model.ts b/packages/global/core/ai/model.ts
@@ -2,8 +2,8 @@ import type { LLMModelItemType, VectorModelItemType } from './model.d';
 
 export const defaultQAModels: LLMModelItemType[] = [
   {
-    model: 'gpt-3.5-turbo-16k',
-    name: 'gpt-3.5-turbo-16k',
+    model: 'gpt-3.5-turbo',
+    name: 'gpt-3.5-turbo',
     maxContext: 16000,
     maxResponse: 16000,
     quoteMaxToken: 13000,

diff --git a/packages/service/core/ai/embedding/index.ts b/packages/service/core/ai/embedding/index.ts
@@ -1,5 +1,6 @@
 import { VectorModelItemType } from '@fastgpt/global/core/ai/model.d';
 import { getAIApi } from '../config';
+import { replaceValidChars } from '../../chat/utils';
 
 type GetVectorProps = {
   model: VectorModelItemType;
@@ -36,7 +37,7 @@ export async function getVectorsByText({ model, input }: GetVectorProps) {
         }
 
         return {
-          charsLength: input.length,
+          charsLength: replaceValidChars(input).length,
           vectors: await Promise.all(res.data.map((item) => unityDimensional(item.embedding)))
         };
       });

diff --git a/packages/service/core/chat/utils.ts b/packages/service/core/chat/utils.ts
@@ -59,11 +59,15 @@ export function ChatContextFilter({
   return [...systemPrompts, ...chats];
 }
 
+export const replaceValidChars = (str: string) => {
+  const reg = /[\s\r\n]+/g;
+  return str.replace(reg, '');
+};
 export const countMessagesChars = (messages: ChatItemType[]) => {
-  return messages.reduce((sum, item) => sum + item.value.length, 0);
+  return messages.reduce((sum, item) => sum + replaceValidChars(item.value).length, 0);
 };
 export const countGptMessagesChars = (messages: ChatMessageItemType[]) =>
-  messages.reduce((sum, item) => sum + item.content.length, 0);
+  messages.reduce((sum, item) => sum + replaceValidChars(item.content).length, 0);
 
 /**
     string to vision model. Follow the markdown code block rule for interception: