Let's use AI to Earn!
TypeScript auto-publishdouyindouyin-apielectron-appelectron-reactkuaishoukwaipublishedshipinhaotoolxiaohongshu
refactor(material): material-admin-generate (#226)
nevind1913c08372b
diff --git a/project/backend/apps/aitoearn-server/src/ai/ai.service.ts b/project/backend/apps/aitoearn-server/src/ai/ai.service.tsindex d58d78a5..dd9102a5 100644--- a/project/backend/apps/aitoearn-server/src/ai/ai.service.ts+++ b/project/backend/apps/aitoearn-server/src/ai/ai.service.ts@@ -18,9 +18,9 @@ export class AiService {) { }/**- * 用户AI聊天- * @param request 聊天请求参数- * @returns AI聊天响应+ * User AI chat+ * @param request Chat request parameters+ * @returns AI chat response*/async userAiChat(request: UserChatCompletionDto) {const response = await this.chatService.userChatCompletion(request)@@ -28,9 +28,9 @@ export class AiService {}/**- * 获取用户AI使用日志- * @param request 日志查询请求参数- * @returns 用户日志响应+ * Get user AI usage logs+ * @param request Log query request parameters+ * @returns User log response*/async getUserLogs(request: LogListQueryDto) {const [list, total] = await this.logsService.getLogList(request)@@ -38,9 +38,9 @@ export class AiService {}/**- * 用户图片生成- * @param request 图片生成请求参数- * @returns 图片生成响应+ * User image generation+ * @param request Image generation request parameters+ * @returns Image generation response*/async userImageGeneration(request: UserImageGenerationDto) {const response = await this.imageService.userGeneration(request)@@ -48,9 +48,9 @@ export class AiService {}/**- * 用户图片编辑- * @param request 图片编辑请求参数- * @returns 图片编辑响应+ * User image editing+ * @param request Image editing request parameters+ * @returns Image editing response*/async userImageEdit(request: UserImageEditDto) {const response = await this.imageService.userEdit(request)@@ -58,9 +58,9 @@ export class AiService {}/**- * 异步用户图片生成- * @param request 图片生成请求参数- * @returns 异步任务响应+ * Async user image generation+ * @param request Image generation request parameters+ * @returns Async task response*/async userImageGenerationAsync(request: UserImageGenerationDto) {const response = await this.imageService.userGenerationAsync(request)@@ -68,9 +68,9 @@ export class AiService {}/**- * 异步用户图片编辑- * @param request 图片编辑请求参数- * @returns 异步任务响应+ * Async user image editing+ * @param request Image editing request parameters+ * @returns Async task response*/async userImageEditAsync(request: UserImageEditDto) {const response = await this.imageService.userEditAsync(request)@@ -78,9 +78,9 @@ export class AiService {}/**- * 异步Markdown转卡片图片- * @param request MD2Card请求参数- * @returns 异步任务响应+ * Async Markdown to card image+ * @param request MD2Card request parameters+ * @returns Async task response*/async generateMd2CardAsync(request: UserMd2CardDto) {const response = await this.imageService.userMd2CardAsync(request)@@ -88,9 +88,9 @@ export class AiService {}/**- * 异步Fireflycard生成卡片图片- * @param request Fireflycard请求参数- * @returns 异步任务响应+ * Async Fireflycard card image generation+ * @param request Fireflycard request parameters+ * @returns Async task response*/async generateFireflycardAsync(request: UserFireflyCardDto) {const response = await this.imageService.userFireFlyCardAsync(request)@@ -98,9 +98,9 @@ export class AiService {}/**- * 查询图片任务状态- * @param logId 任务日志ID- * @returns 任务状态响应+ * Query image task status+ * @param logId Task log ID+ * @returns Task status response*/async getImageTaskStatus(logId: string) {const response = await this.imageService.getTaskStatus(logId)@@ -108,9 +108,9 @@ export class AiService {}/**- * 通用视频生成- * @param request 视频生成请求参数- * @returns 视频生成响应+ * General video generation+ * @param request Video generation request parameters+ * @returns Video generation response*/async userVideoGeneration(request: UserVideoGenerationRequestDto) {const response = await this.videoService.userVideoGeneration(request)@@ -118,9 +118,9 @@ export class AiService {}/**- * 查询视频任务状态- * @param request 视频任务查询请求参数- * @returns 视频任务状态响应+ * Query video task status+ * @param request Video task query request parameters+ * @returns Video task status response*/async getVideoTaskStatus(request: UserVideoTaskQueryDto) {const response = await this.videoService.getVideoTaskStatus(request)@@ -128,9 +128,9 @@ export class AiService {}/**- * 查询视频任务状态- * @param request 视频任务查询请求参数- * @returns 视频任务状态响应+ * Query video task status+ * @param request Video task query request parameters+ * @returns Video task status response*/async listVideoTasks(request: UserListVideoTasksQueryDto) {const [list, total] = await this.videoService.listVideoTasks(request)@@ -138,9 +138,9 @@ export class AiService {}/**- * 火山视频生成- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Volcengine video generation+ * @param request Video generation request parameters+ * @returns Video generation response*/async volcVideoGeneration(request: VolcengineGenerationRequestDto) {const response = await this.videoService.volcengineCreate(request)@@ -148,9 +148,9 @@ export class AiService {}/**- * 火山视频生成- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Volcengine video generation+ * @param request Video generation request parameters+ * @returns Video generation response*/async volcVideoTaskStatus(request: VolcengineTaskQueryDto) {const response = await this.videoService.getVolcengineTask(request.userId, request.userType, request.taskId)@@ -158,9 +158,9 @@ export class AiService {}/**- * 可灵文本到视频生成- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Kling text to video generation+ * @param request Video generation request parameters+ * @returns Video generation response*/async klingText2Video(request: KlingText2VideoRequestDto) {const response = await this.videoService.klingText2Video(request)@@ -168,9 +168,9 @@ export class AiService {}/**- * 可灵图生视频- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Kling image to video+ * @param request Video generation request parameters+ * @returns Video generation response*/async klingImage2Video(request: KlingImage2VideoRequestDto) {const response = await this.videoService.klingImage2Video(request)@@ -178,9 +178,9 @@ export class AiService {}/**- * 可灵多图生视频- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Kling multi-image to video+ * @param request Video generation request parameters+ * @returns Video generation response*/async klingMultiImage2Video(request: KlingMultiImage2VideoRequestDto) {const response = await this.videoService.klingMultiImage2Video(request)@@ -188,9 +188,9 @@ export class AiService {}/**- * 可灵视频生成- * @param request 视频生成请求参数- * @returns 视频生成响应+ * Kling video generation+ * @param request Video generation request parameters+ * @returns Video generation response*/async getKlingTaskStatus(request: KlingTaskQueryDto) {const response = await this.videoService.getKlingTask(request.userId, request.userType, request.taskId)@@ -198,9 +198,9 @@ export class AiService {}/**- * Markdown转卡片图片- * @param request MD2Card请求参数- * @returns MD2Card生成结果+ * Markdown to card image+ * @param request MD2Card request parameters+ * @returns MD2Card generation result*/async generateMd2Card(request: UserMd2CardDto) {const response = await this.imageService.userMd2Card(request)@@ -208,9 +208,9 @@ export class AiService {}/**- * Fireflycard生成卡片图片- * @param request Fireflycard请求参数- * @returns Fireflycard生成结果+ * Fireflycard card image generation+ * @param request Fireflycard request parameters+ * @returns Fireflycard generation result*/async generateFireflycard(request: UserFireflyCardDto) {const response = await this.imageService.userFireFlyCard(request)@@ -218,9 +218,9 @@ export class AiService {}/**- * 获取图片生成模型参数- * @param data 查询参数- * @returns 图片生成模型参数列表+ * Get image generation model parameters+ * @param data Query parameters+ * @returns Image generation model parameters list*/async getImageGenerationModels(data?: ImageGenerationModelsQueryDto) {const response = await this.imageService.generationModelConfig(data || {})@@ -228,9 +228,9 @@ export class AiService {}/**- * 获取图片编辑模型参数- * @param data 查询参数- * @returns 图片编辑模型参数列表+ * Get image editing model parameters+ * @param data Query parameters+ * @returns Image editing model parameters list*/async getImageEditModels(data?: ImageEditModelsQueryDto) {const response = await this.imageService.editModelConfig(data || {})@@ -238,9 +238,9 @@ export class AiService {}/**- * 获取视频生成模型参数- * @param data 查询参数- * @returns 视频生成模型参数列表+ * Get video generation model parameters+ * @param data Query parameters+ * @returns Video generation model parameters list*/async getVideoGenerationModels(data?: VideoGenerationModelsQueryDto) {const response = await this.videoService.getVideoGenerationModelParams(data || {})@@ -248,9 +248,9 @@ export class AiService {}/**- * 获取对话模型参数- * @param data 查询参数- * @returns 对话模型参数列表+ * Get chat model parameters+ * @param data Query parameters+ * @returns Chat model parameters list*/async getChatModels(data?: ChatModelsQueryDto) {const response = await this.chatService.getChatModelConfig(data || {})@@ -258,9 +258,9 @@ export class AiService {}/**- * Dashscope 文生视频- * @param request 文生视频请求参数- * @returns 视频生成响应+ * Dashscope text to video+ * @param request Text to video request parameters+ * @returns Video generation response*/async dashscopeText2Video(request: DashscopeText2VideoRequestDto) {const response = await this.videoService.dashscopeText2Video(request)@@ -268,9 +268,9 @@ export class AiService {}/**- * Dashscope 图生视频- * @param request 图生视频请求参数- * @returns 视频生成响应+ * Dashscope image to video+ * @param request Image to video request parameters+ * @returns Video generation response*/async dashscopeImage2Video(request: DashscopeImage2VideoRequestDto) {const response = await this.videoService.dashscopeImage2Video(request)@@ -278,9 +278,9 @@ export class AiService {}/**- * Dashscope 首尾帧生视频- * @param request 首尾帧生视频请求参数- * @returns 视频生成响应+ * Dashscope key frame to video+ * @param request Key frame to video request parameters+ * @returns Video generation response*/async dashscopeKeyFrame2Video(request: DashscopeKeyFrame2VideoRequestDto) {const response = await this.videoService.dashscopeKeyFrame2Video(request)@@ -288,31 +288,20 @@ export class AiService {}/**- * 查询 Dashscope 任务状态- * @param request 任务查询请求参数- * @returns 任务状态响应+ * Query Dashscope task status+ * @param request Task query request parameters+ * @returns Task status response*/async getDashscopeTaskStatus(request: DashscopeTaskQueryDto) {const response = await this.videoService.getDashscopeTask(request.userId, request.userType, request.taskId)return DashscopeTaskStatusResponseVo.create(response)}- // 智能图片文案- async imgContentByAi(user: { userId: string, userType: UserType }, model: string, imgUrl: string, prompt: string, option: {- title?: string- desc?: string- max?: number- language?: string- }): Promise<string> {+ // Intelligent image content generation+ async imgContentByAi(user: { userId: string, userType: UserType }, model: string, imgUrl: string, prompt: string): Promise<string> {const { userId, userType } = user- const systemContent = `Generate copy based on the pictures and prompt words, as well as the reference titles and contents. Reply in ${option.language || 'English'}. The reply should not exceed ${option.max || 100} characters. Just return the copy.`- let text = `prompt${prompt}.`- if (option.title)- text += `Reference Title: ${option.title}`- if (option.desc)- text += `Reference description: ${option.desc}`-+ const systemContent = `Generate copy based on the pictures and prompt words, as well as the reference titles and contents. Just return the copy.`const request: UserChatCompletionDto = {userId,userType,@@ -333,7 +322,7 @@ export class AiService {},{type: 'text',- text,+ text: prompt,},],},@@ -350,21 +339,11 @@ export class AiService {}}- // 智能视频文案- async videoContentByAi(user: { userId: string, userType: UserType }, model: string, videoUrl: string, prompt: string, option: {- title?: string- desc?: string- max?: number- language?: string- }): Promise<string> {+ // Intelligent video content generation+ async videoContentByAi(user: { userId: string, userType: UserType }, model: string, videoUrl: string, prompt: string): Promise<string> {const { userId, userType } = user- const systemContent = `Generate copy based on the video and prompt words, as well as the reference titles and contents. Reply in ${option.language || 'English'}. The reply should not exceed ${option.max || 100} characters. Just return the copy.`- let text = `prompt${prompt}.`- if (option.title)- text += `Reference Title: ${option.title}`- if (option.desc)- text += `Reference description: ${option.desc}`+ const systemContent = `Generate copy based on the video and prompt words, as well as the reference titles and contents. Just return the copy.`const request: UserChatCompletionDto = {userId,@@ -386,7 +365,7 @@ export class AiService {},{type: 'text',- text,+ text: prompt,},],},@@ -397,7 +376,7 @@ export class AiService {return res.content as string || ''}- // 根据图片返回文字内容+ // Return text content based on imageasync getContentByAi(user: { userId: string, userType: UserType }, model: string, prompt: string, option: {coverUrl?: stringtitle?: string@@ -452,7 +431,7 @@ export class AiService {return res.content as string || ''}- // 根据图片返回文字内容+ // Return text content based on imageasync getTitleByAi(user: { userId: string, userType: UserType }, model: string, desc: string, option: {title?: stringmax?: numberdiff --git a/project/backend/apps/aitoearn-server/src/content/common.ts b/project/backend/apps/aitoearn-server/src/content/common.tsindex 5b60681d..e5c1bfd9 100644--- a/project/backend/apps/aitoearn-server/src/content/common.ts+++ b/project/backend/apps/aitoearn-server/src/content/common.ts@@ -1,15 +1,15 @@import { UserType } from '@yikart/common'export enum PubStatus {- UNPUBLISH = 0, // 未发布/草稿- RELEASED = 1, // 已发布- FAIL = 2, // 发布失败- PartSuccess = 3, // 部分成功+ UNPUBLISH = 0, // Unpublished/Draft+ RELEASED = 1, // Published+ FAIL = 2, // Publish failed+ PartSuccess = 3, // Partially successful}export enum PubType {- VIDEO = 'video', // 视频- ARTICLE = 'article', // 文章+ VIDEO = 'video', // Video+ ARTICLE = 'article', // Article}export interface PubRecord {@@ -28,8 +28,8 @@ export interface PubRecord {}export enum MaterialType {- VIDEO = 'video', // 视频- ARTICLE = 'article', // 文章+ VIDEO = 'video', // Video+ ARTICLE = 'article', // Article}export enum MaterialStatus {@@ -41,7 +41,7 @@ export enum MaterialStatus {export interface Material {id: stringuserId: string- groupId?: string // 所属组ID+ groupId?: string // Group IDtype: MaterialTypecoverUrl?: stringmediaList: MaterialMedia[]@@ -65,7 +65,7 @@ export interface NewMaterial {userType?: UserTypetaskId?: stringtype: MaterialType- groupId: string // 所属组ID+ groupId: string // Group IDcoverUrl?: stringmediaList: MaterialMedia[]title: string@@ -82,9 +82,6 @@ export interface NewMaterialTask {aiModelTag: stringprompt: stringtype: MaterialType- title?: string- desc?: string- location?: number[]mediaGroups: string[]coverGroup: stringoption?: Record<string, any>@@ -109,23 +106,16 @@ export interface MaterialTask {id: stringuserId: stringuserType: UserType- groupId: string // 所属组ID+ groupId: string // Group IDtype: MaterialTypeaiModelTag: string- prompt: string // 提示词+ prompt: string // PromptcoverGroup?: stringmediaGroups: string[]- option?: Record<string, any> // 高级设置- title?: string- textMax?: number- desc?: string- location?: number[]- coverUrl?: string- coverUrlList: MediaUrlInfo[] // 封面数组- mediaUrlMap: MediaUrlInfo[][] // 媒体的二维数组+ option?: Record<string, any> // Advanced settings+ coverUrlList: MediaUrlInfo[] // Cover array+ mediaUrlMap: MediaUrlInfo[][] // 2D array of mediareNum: number- max?: number- language?: stringstatus: MaterialTaskStatusautoDeleteMedia: boolean}@@ -161,16 +151,16 @@ export interface MaterialGroup {}export enum MediaType {- VIDEO = 'video', // 视频- IMG = 'img', // 图片+ VIDEO = 'video', // Video+ IMG = 'img', // Image}export interface Media {id: stringuserId: stringuserType?: string- groupId?: string // 所属组ID- materialId?: string // 所属素材ID+ groupId?: string // Group ID+ materialId?: string // Material IDtype: MaterialTypeurl: stringtitle?: string@@ -182,8 +172,8 @@ export interface Media {export interface NewMedia {userId: stringuserType?: string- groupId?: string // 所属组ID- materialId?: string // 所属素材ID+ groupId?: string // Group ID+ materialId?: string // Material IDtype: MediaTypeurl: stringthumbUrl?: stringdiff --git a/project/backend/apps/aitoearn-server/src/content/dto/material.dto.ts b/project/backend/apps/aitoearn-server/src/content/dto/material.dto.tsindex d27d9a57..b3585722 100644--- a/project/backend/apps/aitoearn-server/src/content/dto/material.dto.ts+++ b/project/backend/apps/aitoearn-server/src/content/dto/material.dto.ts@@ -30,13 +30,9 @@ export const createMaterialTaskSchema = z.object({num: z.number().describe('生成数量'),aiModelTag: z.string().describe('AI模型tag'),prompt: z.string().describe('提示词'),- title: z.string().optional().describe('参考标题'),- desc: z.string().optional().describe('参考描述'),mediaGroups: z.array(z.string()).min(1).max(5).describe('媒体组ID列表'),coverGroup: z.string().describe('参考描述'),option: z.any().optional().describe('高级设置'),- textMax: z.number().optional().describe('最大文字数量'),- language: z.string().optional().describe('语言'),// type: z.enum([MaterialType.VIDEO, MaterialType.ARTICLE]).describe('草稿类型'),autoDeleteMedia: z.boolean().optional().describe('自动删除素材'),})diff --git a/project/backend/apps/aitoearn-server/src/content/materialTask.service.ts b/project/backend/apps/aitoearn-server/src/content/materialTask.service.tsindex 833b59bc..5550c508 100644--- a/project/backend/apps/aitoearn-server/src/content/materialTask.service.ts+++ b/project/backend/apps/aitoearn-server/src/content/materialTask.service.ts@@ -91,7 +91,7 @@ export class MaterialTaskService {const taskInfo = await this.getInfo(id)if (!taskInfo)throw new AppException(ResponseCode.MaterialTaskNotFound)- // 开始任务+ // Start taskawait this.queueService.addMaterialGenerateJob({taskId: taskInfo.id,})@@ -138,11 +138,7 @@ export class MaterialTaskService {coverGroup: inData.coverGroup,mediaGroups: inData.mediaGroups,option: inData.option,- title: inData.title,- desc: inData.desc,reNum: inData.num,- textMax: inData.textMax,- language: inData.language,autoDeleteMedia: inData.autoDeleteMedia,}@@ -171,12 +167,6 @@ export class MaterialTaskService {type: MediaType,fileUrl: string,prompt: string,- option: {- title?: string- desc?: string- max?: number- language?: string- },) {if (type === MediaType.IMG) {const res = await this.aiService.imgContentByAi(@@ -184,7 +174,6 @@ export class MaterialTaskService {model,fileUrl,prompt,- option,)return res}@@ -195,7 +184,6 @@ export class MaterialTaskService {model,fileUrl,prompt,- option,)return res}@@ -287,12 +275,6 @@ export class MaterialTaskService {theOne.type,await buildUrl(config.awsS3.endpoint, theOne.url),taskInfo.aiModelTag,- {- title: taskInfo.title,- desc: taskInfo.desc,- max: taskInfo.textMax,- language: taskInfo.language,- },)if (!content) {res.status = -1@@ -433,13 +415,10 @@ export class MaterialTaskService {taskInfo.prompt,{coverUrl: theOneCover.url,- title: taskInfo.title,desc: dbDesc,- max: taskInfo.textMax,- language: taskInfo.language,},theOneCover.url- ? await buildUrl(config.awsS3.endpoint, theOneCover.url)+ ? buildUrl(config.awsS3.endpoint, theOneCover.url): undefined,)@@ -468,7 +447,7 @@ export class MaterialTaskService {return res}- // 更新数据库+ // Update databaseconst upDbRes = await this.materialService.updateInfo(newMaterial.id,updateData,@@ -490,7 +469,7 @@ export class MaterialTaskService {const upRes = await this.update(taskInfo.id, taskInfo)if (!upRes) {res.status = -1- res.message = '更新内容失败'+ res.message = 'Failed to update content'return res}@@ -505,7 +484,7 @@ export class MaterialTaskService {}})()- // 使用Promise.race来实现超时控制+ // Use Promise.race to implement timeout controltry {const result = await Promise.race([mainTaskPromise, timeoutPromise])return resultdiff --git a/project/backend/apps/aitoearn-server/src/internal/material.controller.ts b/project/backend/apps/aitoearn-server/src/internal/material.controller.tsindex 25113822..1b09afe7 100644--- a/project/backend/apps/aitoearn-server/src/internal/material.controller.ts+++ b/project/backend/apps/aitoearn-server/src/internal/material.controller.ts@@ -111,7 +111,7 @@ export class MaterialInternalController {async createTask(@Body() body: CreateMaterialTaskDto) {const mediaGroupInfo = await this.mediaGroupService.getInfo(body.mediaGroups[0])if (!mediaGroupInfo) {- throw new Error('素材组不存在')+ throw new AppException(ResponseCode.MediaGroupNotFound)}const type = mediaGroupInfo?.type as MediaTypediff --git a/project/backend/libs/mongodb/src/schemas/materialTask.schema.ts b/project/backend/libs/mongodb/src/schemas/materialTask.schema.tsindex 3f58fd2b..4b5ea53b 100644--- a/project/backend/libs/mongodb/src/schemas/materialTask.schema.ts+++ b/project/backend/libs/mongodb/src/schemas/materialTask.schema.ts@@ -70,7 +70,7 @@ export class MaterialTask extends WithTimestampSchema {required: true,index: true,})- groupId: string // 所属组ID+ groupId: string // Group ID@Prop({required: true,@@ -87,14 +87,14 @@ export class MaterialTask extends WithTimestampSchema {@Prop({required: true,})- prompt: string // 提示词+ prompt: string // Prompt@Prop({required: false,})coverGroup?: string- // 使用的媒体组数组+ // Array of media groups used@Prop({type: [String],default: [],@@ -104,48 +104,27 @@ export class MaterialTask extends WithTimestampSchema {@Prop({required: false,default: {},- type: Object, // 明确指定类型为 Object+ type: Object, // Explicitly specify type as Object})- option?: Record<string, unknown> // 高级设置-- @Prop({- required: false,- })- title?: string-- @Prop({- required: false,- })- desc?: string+ option?: Record<string, unknown> // Advanced settings@Prop({required: true,type: [MediaUrlInfo],})- coverUrlList: MediaUrlInfo[] // 封面数组+ coverUrlList: MediaUrlInfo[] // Cover array@Prop({required: true,type: SchemaTypes.Mixed,})- mediaUrlMap: MediaUrlInfo[][] // 媒体的二维数组+ mediaUrlMap: MediaUrlInfo[][] // 2D array of media@Prop({required: true,})reNum: number- @Prop({- required: false,- type: Number,- })- textMax?: number-- @Prop({- required: false,- })- language?: string-@Prop({required: true,enum: MaterialTaskStatus,