Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 5dab0b06 by Archer Committed by GitHub
Options

Visibillty playground (#6152) 

* feat: add chat visibility controls and improve quote reader permissions (#6102)

* feat: add chat visibility controls and improve quote reader permissions

* fix test

* zod

* fix

* test & openapi

* frontend filter

* update name

* fix

* fix

* rename variables

* fix

* test

* fix build

* fix

* fix

---------

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

* perf: init shell

---------

Co-authored-by: heheer <heheer@sealos.io>
parent 5547d917
Showing with 31 additions and 203 deletions
packages/global/support/outLink/type.d.ts
...@@ -88,6 +88,11 @@ export type OutLinkSchema<T extends OutlinkAppType = undefined> = { ...@@ -88,6 +88,11 @@ export type OutLinkSchema<T extends OutlinkAppType = undefined> = {
}; };
app: T; app: T;
//@deprecated
responseDetail?: boolean;
showNodeStatus?: boolean;
showRawSource?: boolean;
}; };
// Edit the Outlink // Edit the Outlink
......
packages/service/support/outLink/schema.ts
...@@ -85,7 +85,12 @@ const OutLinkSchema = new Schema({ ...@@ -85,7 +85,12 @@ const OutLinkSchema = new Schema({
}, },
defaultResponse: { defaultResponse: {
type: String type: String
} },
//@deprecated
responseDetail: Boolean,
showNodeStatus: Boolean,
showRawSource: Boolean
}); });
OutLinkSchema.virtual('associatedApp', { OutLinkSchema.virtual('associatedApp', {
......
projects/app/src/pageComponents/app/detail/Publish/Playground/index.tsx
...@@ -106,7 +106,7 @@ const PlaygroundVisibilityConfig = ({ appId }: { appId: string }) => { ...@@ -106,7 +106,7 @@ const PlaygroundVisibilityConfig = ({ appId }: { appId: string }) => {
{t('publish:private_config')} {t('publish:private_config')}
</Box> </Box>
<Grid templateColumns={'1fr 1fr'} gap={4} mt={4}> <Grid templateColumns={'1fr 1fr'} gap={4} mt={4} w={'400px'}>
<Flex alignItems={'center'}> <Flex alignItems={'center'}>
<FormLabel fontSize={'12px'} flex={'0 0 127px'}> <FormLabel fontSize={'12px'} flex={'0 0 127px'}>
{t('publish:show_node')} {t('publish:show_node')}
...@@ -138,9 +138,6 @@ const PlaygroundVisibilityConfig = ({ appId }: { appId: string }) => { ...@@ -138,9 +138,6 @@ const PlaygroundVisibilityConfig = ({ appId }: { appId: string }) => {
isChecked={showCite} isChecked={showCite}
/> />
</Flex> </Flex>
</Grid>
<Grid templateColumns={'1fr 1fr'} gap={4} mt={4}>
<Flex> <Flex>
<Flex alignItems={'center'} flex={'0 0 127px'}> <Flex alignItems={'center'} flex={'0 0 127px'}>
<FormLabel fontSize={'12px'}>{t('common:core.app.share.Show full text')}</FormLabel> <FormLabel fontSize={'12px'}>{t('common:core.app.share.Show full text')}</FormLabel>
......
projects/app/src/pages/api/admin/initv4145.ts
import { NextAPI } from '@/service/middleware/entry'; import { NextAPI } from '@/service/middleware/entry';
import { batchRun } from '@fastgpt/global/common/system/utils';
import { getQueue, QueueNames } from '@fastgpt/service/common/bullmq';
import type { S3MQJobData } from '@fastgpt/service/common/s3/mq';
import { addLog } from '@fastgpt/service/common/system/log';
import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next'; import type { ApiRequestProps, ApiResponseType } from '@fastgpt/service/type/next';
import { authCert } from '@fastgpt/service/support/permission/auth/common'; import { authCert } from '@fastgpt/service/support/permission/auth/common';
import { PublishChannelEnum } from '@fastgpt/global/support/outLink/constant'; import { PublishChannelEnum } from '@fastgpt/global/support/outLink/constant';
import { connectionMongo } from '@fastgpt/service/common/mongo'; import { MongoOutLink } from '@fastgpt/service/support/outLink/schema';
import { addLog } from '@fastgpt/service/common/system/log';
export type ResponseType = { export type ResponseType = {
message: string; message: string;
retriedCount: number;
failedCount: number;
shareLinkMigration: { shareLinkMigration: {
totalRecords: number; totalRecords: number;
updatedRecords: number; updatedRecords: number;
...@@ -33,57 +28,6 @@ export type ResponseType = { ...@@ -33,57 +28,6 @@ export type ResponseType = {
*/ */
/** /**
* 功能1: 重试所有失败的 S3 删除任务
*/
async function retryFailedS3DeleteJobs(): Promise<{
retriedCount: number;
failedCount: number;
}> {
const queue = getQueue<S3MQJobData>(QueueNames.s3FileDelete);
const failedJobs = await queue.getFailed();
console.log(`Found ${failedJobs.length} failed S3 delete jobs`);
let retriedCount = 0;
await batchRun(
failedJobs,
async (job) => {
addLog.debug(`Retrying S3 delete job with new attempts`, { retriedCount });
try {
// Remove old job and recreate with new attempts
const jobData = job.data;
await job.remove();
// Add new job with more attempts
await queue.add('delete-s3-files', jobData, {
attempts: 10,
removeOnFail: {
count: 10000, // 保留10000个失败任务
age: 14 * 24 * 60 * 60 // 14 days
},
removeOnComplete: true,
backoff: {
delay: 2000,
type: 'exponential'
}
});
retriedCount++;
console.log(`Retried S3 delete job ${job.id} with new attempts`);
} catch (error) {
console.error(`Failed to retry S3 delete job ${job.id}:`, error);
}
},
100
);
return {
retriedCount,
failedCount: failedJobs.length
};
}
/**
* 功能2和3: 处理 OutLink 记录的数据迁移 * 功能2和3: 处理 OutLink 记录的数据迁移
* - 添加 showFullText 字段 * - 添加 showFullText 字段
* - 重命名现有字段 * - 重命名现有字段
...@@ -102,143 +46,22 @@ async function migrateOutLinkData(): Promise<{ ...@@ -102,143 +46,22 @@ async function migrateOutLinkData(): Promise<{
updated: number; updated: number;
}> = []; }> = [];
// 获取 MongoDB 原生集合，绕过 Mongoose 的严格模式
const db = connectionMongo.connection.db;
if (!db) {
throw new Error('Database connection not established');
}
const outLinkCollection = db.collection('outlinks');
// 1. 为所有 share 类型的记录添加 showFullText 字段 // 1. 为所有 share 类型的记录添加 showFullText 字段
const shareLinks = await outLinkCollection const shareLinks = await MongoOutLink.find({
.find({ type: PublishChannelEnum.share
type: PublishChannelEnum.share,
showFullText: { $exists: false } // 只查找没有 showFullText 字段的记录
})
.toArray();
if (shareLinks.length > 0) {
// 批量更新添加 showFullText 字段
const showFullTextOps = shareLinks.map((link: any) => ({
updateOne: {
filter: { _id: link._id },
update: { $set: { showFullText: link.showRawSource ?? true } }
}
}));
const showFullTextResult = await outLinkCollection.bulkWrite(showFullTextOps);
totalUpdated += showFullTextResult.modifiedCount;
updateResults.push({
operation: 'Add showFullText field',
updated: showFullTextResult.modifiedCount
});
console.log(`Added showFullText field to ${showFullTextResult.modifiedCount} share links`);
}
// 2. 重命名字段：showNodeStatus -> showRunningStatus
const showNodeStatusLinks = await outLinkCollection
.find({
showNodeStatus: { $exists: true },
showRunningStatus: { $exists: false }
})
.toArray();
if (showNodeStatusLinks.length > 0) {
const renameNodeStatusOps = showNodeStatusLinks.map((link: any) => ({
updateOne: {
filter: { _id: link._id },
update: [
{
$set: { showRunningStatus: '$showNodeStatus' }
},
{
$unset: 'showNodeStatus'
}
]
}
}));
const renameNodeStatusResult = await outLinkCollection.bulkWrite(renameNodeStatusOps);
totalUpdated += renameNodeStatusResult.modifiedCount;
updateResults.push({
operation: 'Rename showNodeStatus to showRunningStatus',
updated: renameNodeStatusResult.modifiedCount
}); });
console.log( for await (const link of shareLinks) {
`Renamed showNodeStatus to showRunningStatus for ${renameNodeStatusResult.modifiedCount} links` try {
); link.showFullText = link.showFullText ?? link.showRawSource ?? true;
} link.showRunningStatus = link.showRunningStatus ?? link.showNodeStatus ?? false;
link.showCite = link.showCite ?? link.responseDetail ?? false;
// 3. 重命名字段：responseDetail -> showCite link.canDownloadSource = link.canDownloadSource ?? link.showRawSource ?? false;
const responseDetailLinks = await outLinkCollection await link.save();
.find({ addLog.info(`[initv4145] 迁移 OutLink 数据成功: ${link.shareId}`);
responseDetail: { $exists: true }, } catch (error) {
showCite: { $exists: false } addLog.error('[initv4145] 迁移 OutLink 数据失败:', error);
})
.toArray();
if (responseDetailLinks.length > 0) {
const renameResponseDetailOps = responseDetailLinks.map((link: any) => ({
updateOne: {
filter: { _id: link._id },
update: [
{
$set: { showCite: '$responseDetail' }
},
{
$unset: 'responseDetail'
}
]
}
}));
const renameResponseDetailResult = await outLinkCollection.bulkWrite(renameResponseDetailOps);
totalUpdated += renameResponseDetailResult.modifiedCount;
updateResults.push({
operation: 'Rename responseDetail to showCite',
updated: renameResponseDetailResult.modifiedCount
});
console.log(
`Renamed responseDetail to showCite for ${renameResponseDetailResult.modifiedCount} links`
);
}
// 4. 重命名字段：showRawSource -> canDownloadSource
const showRawSourceLinks = await outLinkCollection
.find({
showRawSource: { $exists: true },
canDownloadSource: { $exists: false }
})
.toArray();
if (showRawSourceLinks.length > 0) {
const renameRawSourceOps = showRawSourceLinks.map((link: any) => ({
updateOne: {
filter: { _id: link._id },
update: [
{
$set: { canDownloadSource: '$showRawSource' }
},
{
$unset: 'showRawSource'
}
]
} }
}));
const renameRawSourceResult = await outLinkCollection.bulkWrite(renameRawSourceOps);
totalUpdated += renameRawSourceResult.modifiedCount;
updateResults.push({
operation: 'Rename showRawSource to canDownloadSource',
updated: renameRawSourceResult.modifiedCount
});
console.log(
`Renamed showRawSource to canDownloadSource for ${renameRawSourceResult.modifiedCount} links`
);
} }
return { return {
...@@ -257,9 +80,6 @@ async function handler( ...@@ -257,9 +80,6 @@ async function handler(
): Promise<ResponseType> { ): Promise<ResponseType> {
await authCert({ req, authRoot: true }); await authCert({ req, authRoot: true });
// 执行功能1: 重试 S3 删除任务
const s3JobResult = await retryFailedS3DeleteJobs();
// 执行功能2&3: OutLink 数据迁移 // 执行功能2&3: OutLink 数据迁移
let shareLinkMigration = { let shareLinkMigration = {
totalRecords: 0, totalRecords: 0,
...@@ -276,8 +96,6 @@ async function handler( ...@@ -276,8 +96,6 @@ async function handler(
return { return {
message: `Completed v4.14.5 initialization: S3 job retries and outLink migration`, message: `Completed v4.14.5 initialization: S3 job retries and outLink migration`,
retriedCount: s3JobResult.retriedCount,
failedCount: s3JobResult.failedCount,
shareLinkMigration shareLinkMigration
}; };
} }
......
projects/app/src/pages/chat/index.tsx
...@@ -117,9 +117,12 @@ const ChatContent = (props: ChatPageProps) => { ...@@ -117,9 +117,12 @@ const ChatContent = (props: ChatPageProps) => {
}; };
}, [appId, chatId]); }, [appId, chatId]);
const loginSuccess = useCallback(async (res: LoginSuccessResponse) => { const loginSuccess = useCallback(
async (res: LoginSuccessResponse) => {
setUserInfo(res.user); setUserInfo(res.user);
}, []); },
[setUserInfo]
);
// Waiting for user info to be initialized // Waiting for user info to be initialized
if (!isInitedUser) { if (!isInitedUser) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment