4.6.8-alpha (#804)

* perf: redirect request and err log replace

perf: dataset openapi

feat: session

fix: retry input error

feat: 468 doc

sub page

feat: standard sub

perf: rerank tip

perf: rerank tip

perf: api sdk

perf: openapi

sub plan

perf: sub ui

fix: ts

* perf: init log

* fix: variable select

* sub page

* icon

* perf: llm model config

* perf: menu ux

* perf: system store

* perf: publish app name

* fix: init data

* perf: flow edit ux

* fix: value type format and ux

* fix prompt editor default value (#13)

* fix prompt editor default value

* fix prompt editor update when not focus

* add key with variable

---------

Co-authored-by: Archer <545436317@qq.com>

* fix: value type

* doc

* i18n

* import path

* home page

* perf: mongo session running

* fix: ts

* perf: use toast

* perf: flow edit

* perf: sse response

* slider ui

* fetch error

* fix prompt editor rerender when not focus by key defaultvalue (#14)

* perf: prompt editor

* feat: dataset search concat

* perf: doc

* fix:ts

* perf: doc

* fix json editor onblur value (#15)

* faq

* vector model default config

* ipv6

---------

Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>

packages/service/support/permission/auth/common.ts

@@ -2,7 +2,7 @@ import { AuthUserTypeEnum } from '@fastgpt/global/support/permission/constant';
 import { parseHeaderCert } from '../controller';
 import { AuthModeType } from '../type';
 import { authOutLinkValid } from './outLink';
-import { isIPv6 } from 'net';
+import { SERVICE_LOCAL_HOST } from '../../../common/system/tools';
 
 export const authCert = async (props: AuthModeType) => {
   const result = await parseHeaderCert(props);
@@ -35,12 +35,7 @@ export async function authCertOrShareId({
 
 /* auth the request from local service */
 export const authRequestFromLocal = ({ req }: AuthModeType) => {
-  const host =
-    process.env.HOSTNAME && isIPv6(process.env.HOSTNAME)
-      ? `[${process.env.HOSTNAME}]:${process.env.PORT || 3000}`
-      : `${process.env.HOSTNAME || 'localhost'}:${process.env.PORT || 3000}`;
-
-  if (host !== req.headers.host) {
+  if (req.headers.host !== SERVICE_LOCAL_HOST) {
     return Promise.reject('Invalid request');
   }
 };

packages/service/support/permission/controller.ts

@@ -111,8 +111,7 @@ export async function parseHeaderCert({
     }
   }
 
-  const { cookie, token, apikey, rootkey, authorization } = (req.headers ||
-    {}) as ReqHeaderAuthType;
+  const { cookie, token, rootkey, authorization } = (req.headers || {}) as ReqHeaderAuthType;
 
   const { uid, teamId, tmbId, appId, openApiKey, authType } = await (async () => {
     if (authApiKey && authorization) {
@@ -151,19 +150,6 @@ export async function parseHeaderCert({
         authType: AuthUserTypeEnum.root
       };
     }
-    // apikey: abandon
-    if (authApiKey && apikey) {
-      // apikey
-      const parseResult = await authOpenApiKey({ apikey });
-      return {
-        uid: parseResult.userId,
-        teamId: parseResult.teamId,
-        tmbId: parseResult.tmbId,
-        appId: parseResult.appId,
-        openApiKey: parseResult.apikey,
-        authType: AuthUserTypeEnum.apikey
-      };
-    }
 
     return Promise.reject(ERROR_ENUM.unAuthorization);
   })();

packages/service/support/permission/limit/dataset.ts

@@ -1,17 +1,18 @@
+import { StandSubPlanLevelMapType } from '@fastgpt/global/support/wallet/sub/type';
 import { getVectorCountByTeamId } from '../../../common/vectorStore/controller';
-import { getTeamDatasetValidSub } from '../../wallet/sub/utils';
+import { getTeamDatasetMaxSize } from '../../wallet/sub/utils';
 
 export const checkDatasetLimit = async ({
   teamId,
-  freeSize = Infinity,
-  insertLen = 0
+  insertLen = 0,
+  standardPlans
 }: {
   teamId: string;
-  freeSize?: number;
   insertLen?: number;
+  standardPlans?: StandSubPlanLevelMapType;
 }) => {
   const [{ maxSize }, usedSize] = await Promise.all([
-    getTeamDatasetValidSub({ teamId, freeSize }),
+    getTeamDatasetMaxSize({ teamId, standardPlans }),
     getVectorCountByTeamId(teamId)
   ]);