Commercial baseurl (#697)

projects/app/src/service/core/app/utils.ts

@@ -1,9 +1,10 @@
 import { AppSimpleEditConfigTemplateType } from '@fastgpt/global/core/app/type';
 import { GET } from '@fastgpt/service/common/api/plusRequest';
+import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
 export async function getSimpleTemplatesFromPlus(): Promise<AppSimpleEditConfigTemplateType[]> {
   try {
-    if (!global.systemEnv?.pluginBaseUrl) return [];
+    if (!FastGPTProUrl) return [];
 
     return GET<AppSimpleEditConfigTemplateType[]>('/core/app/getSimpleTemplates');
   } catch (error) {

projects/app/src/service/core/dataset/utils.ts

@@ -1,24 +0,0 @@
-import { MongoDatasetData } from '@fastgpt/service/core/dataset/data/schema';
-
-/**
- * Same value judgment
- */
-export async function hasSameValue({
-  collectionId,
-  q,
-  a = ''
-}: {
-  collectionId: string;
-  q: string;
-  a?: string;
-}) {
-  const count = await MongoDatasetData.countDocuments({
-    q,
-    a,
-    collectionId
-  });
-
-  if (count > 0) {
-    return Promise.reject('已经存在完全一致的数据');
-  }
-}

projects/app/src/service/events/generateQA.ts

@@ -140,7 +140,7 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
     const qaArr = formatSplitText(answer, text); // 格式化后的QA对
 
     // get vector and insert
-    await pushDataToDatasetCollection({
+    const { insertLen } = await pushDataToDatasetCollection({
       teamId: data.teamId,
       tmbId: data.tmbId,
       collectionId: data.collectionId,
@@ -162,7 +162,7 @@ ${replaceVariable(Prompt_AgentQA.fixedText, { text })}`;
     });
 
     // add bill
-    if (qaArr.length > 0) {
+    if (insertLen > 0) {
       pushQABill({
         teamId: data.teamId,
         tmbId: data.tmbId,

projects/app/src/service/moduleDispatch/chat/oneapi.ts

@@ -247,7 +247,7 @@ function filterQuote({
     maxTokens: model.quoteMaxToken,
     messages: quoteQA.map((item, index) => ({
       obj: ChatRoleEnum.System,
-      value: getValue(item, index)
+      value: getValue(item, index).trim()
     }))
   });
 

projects/app/src/service/support/permission/auth/bill.ts

@@ -1,7 +1,8 @@
 import { GET } from '@fastgpt/service/common/api/plusRequest';
+import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
 export const authTeamBalance = async (teamId: string) => {
-  if (global.systemEnv?.pluginBaseUrl) {
+  if (FastGPTProUrl) {
     return GET('/support/permission/authBalance', { teamId });
   }
   return true;

projects/app/src/service/support/user/inform/api.ts

@@ -1,7 +1,8 @@
 import { POST } from '@fastgpt/service/common/api/plusRequest';
 import { SendInformProps } from '@fastgpt/global/support/user/inform/type';
+import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
 export function sendOneInform(data: SendInformProps) {
-  if (!global.systemEnv?.pluginBaseUrl) return;
+  if (!FastGPTProUrl) return;
   return POST('/support/user/inform/create', data);
 }

projects/app/src/service/support/wallet/bill/controller.ts

@@ -1,9 +1,10 @@
 import { ConcatBillProps, CreateBillProps } from '@fastgpt/global/support/wallet/bill/api';
 import { addLog } from '@fastgpt/service/common/system/log';
 import { POST } from '@fastgpt/service/common/api/plusRequest';
+import { FastGPTProUrl } from '@fastgpt/service/common/system/constants';
 
 export function createBill(data: CreateBillProps) {
-  if (!global.systemEnv?.pluginBaseUrl) return;
+  if (!FastGPTProUrl) return;
   if (data.total === 0) {
     addLog.info('0 Bill', data);
   }
@@ -12,7 +13,7 @@ export function createBill(data: CreateBillProps) {
   } catch (error) {}
 }
 export function concatBill(data: ConcatBillProps) {
-  if (!global.systemEnv?.pluginBaseUrl) return;
+  if (!FastGPTProUrl) return;
   if (data.total === 0) {
     addLog.info('0 Bill', data);
   }