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/common/file/image/controller.ts

@@ -1,6 +1,7 @@
 import { UploadImgProps } from '@fastgpt/global/common/file/api';
 import { imageBaseUrl } from '@fastgpt/global/common/file/image/constants';
 import { MongoImage } from './schema';
+import { ClientSession } from '../../../common/mongo';
 
 export function getMongoImgUrl(id: string) {
   return `${imageBaseUrl}${id}`;
@@ -48,15 +49,20 @@ export async function readMongoImg({ id }: { id: string }) {
 
 export async function delImgByRelatedId({
   teamId,
-  relateIds
+  relateIds,
+  session
 }: {
   teamId: string;
   relateIds: string[];
+  session: ClientSession;
 }) {
   if (relateIds.length === 0) return;
 
-  return MongoImage.deleteMany({
-    teamId,
-    'metadata.relatedId': { $in: relateIds.map((id) => String(id)) }
-  });
+  return MongoImage.deleteMany(
+    {
+      teamId,
+      'metadata.relatedId': { $in: relateIds.map((id) => String(id)) }
+    },
+    { session }
+  );
 }

packages/service/common/mongo/sessionRun.ts

@@ -1,21 +1,21 @@
-import mongoose, { connectionMongo } from './index';
+import { connectionMongo, ClientSession } from './index';
 
-export async function mongoSessionTask(
-  fn: (session: mongoose.mongo.ClientSession) => Promise<any>
-) {
+export const mongoSessionRun = async <T = unknown>(fn: (session: ClientSession) => Promise<T>) => {
   const session = await connectionMongo.startSession();
+  session.startTransaction();
 
   try {
-    session.startTransaction();
-
-    await fn(session);
+    const result = await fn(session);
 
     await session.commitTransaction();
-    await session.endSession();
+    session.endSession();
+
+    return result as T;
   } catch (error) {
+    console.log(error);
+
     await session.abortTransaction();
-    await session.endSession();
-    console.error(error);
+    session.endSession();
     return Promise.reject(error);
   }
-}
+};

packages/service/common/system/tools.ts

@@ -0,0 +1,7 @@
+import { isIPv6 } from 'net';
+
+export const SERVICE_LOCAL_PORT = `${process.env.PORT || 3000}`;
+export const SERVICE_LOCAL_HOST =
+  process.env.HOSTNAME && isIPv6(process.env.HOSTNAME)
+    ? `[${process.env.HOSTNAME}]:${SERVICE_LOCAL_PORT}`
+    : `${process.env.HOSTNAME || 'localhost'}:${SERVICE_LOCAL_PORT}`;

packages/service/common/vectorStore/controller.d.ts

@@ -16,4 +16,5 @@ export type InsertVectorProps = {
 export type EmbeddingRecallProps = {
   datasetIds: string[];
   similarity?: number;
+  efSearch?: number;
 };

packages/service/common/vectorStore/controller.ts

@@ -2,6 +2,7 @@
 import { PgVector } from './pg/class';
 import { getVectorsByText } from '../../core/ai/embedding';
 import { InsertVectorProps } from './controller.d';
+import { VectorModelItemType } from '@fastgpt/global/core/ai/model.d';
 
 const getVectorObj = () => {
   return new PgVector();
@@ -20,7 +21,7 @@ export const insertDatasetDataVector = async ({
   ...props
 }: InsertVectorProps & {
   query: string;
-  model: string;
+  model: VectorModelItemType;
 }) => {
   const { vectors, charsLength } = await getVectorsByText({
     model,
@@ -43,7 +44,7 @@ export const updateDatasetDataVector = async ({
 }: InsertVectorProps & {
   id: string;
   query: string;
-  model: string;
+  model: VectorModelItemType;
 }) => {
   // insert new vector
   const { charsLength, insertId } = await insertDatasetDataVector(props);

packages/service/common/vectorStore/pg/controller.ts

@@ -121,12 +121,12 @@ export const embeddingRecall = async (
 ): Promise<{
   results: EmbeddingRecallItemType[];
 }> => {
-  const { datasetIds, vectors, limit, similarity = 0, retry = 2 } = props;
+  const { datasetIds, vectors, limit, similarity = 0, retry = 2, efSearch = 100 } = props;
 
   try {
     const results: any = await PgClient.query(
       `BEGIN;
-        SET LOCAL hnsw.ef_search = ${global.systemEnv.pgHNSWEfSearch || 100};
+        SET LOCAL hnsw.ef_search = ${efSearch};
         select id, collection_id, (vector <#> '[${vectors[0]}]') * -1 AS score 
           from ${PgDatasetTableName} 
           where dataset_id IN (${datasetIds.map((id) => `'${String(id)}'`).join(',')})