From 92fa30ef3d508071ef40af04b3efc314951fd19f Mon Sep 17 00:00:00 2001 From: zhaoyingbo Date: Mon, 12 Aug 2024 12:24:45 +0000 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=88=9D=E6=AD=A5?= =?UTF-8?q?=E7=9A=84CR?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 5 + bun.lockb | Bin 105738 -> 141952 bytes controllers/manageMrEvent/index.ts | 152 ++ controllers/manageMrEvent/reviewFiles.ts | 152 ++ controllers/manageMrEvent/summaryFiles.ts | 126 ++ controllers/manageMrEvent/summaryMr.ts | 56 + controllers/manageMrEvent/utils/commenter.ts | 221 +++ controllers/manageMrEvent/utils/diffTools.ts | 342 ++++ controllers/manageMrEvent/utils/inputs.ts | 128 ++ controllers/manageMrEvent/utils/pathFilter.ts | 60 + controllers/manageMrEvent/utils/prompts.ts | 206 +++ index.ts | 11 +- ...4ce4c791e6f91cf40117d4a85785c6b-audit.json | 15 + log/index.ts | 38 + package.json | 9 +- routes/event/index.ts | 18 +- script/mr/changes.json | 1388 +++++++++++++++++ script/mr/comments.json | 443 ++++++ script/mr/event.json | 17 + service/gitlab/discussions.ts | 64 + service/gitlab/index.ts | 6 + service/gitlab/mr.ts | 78 +- service/gitlab/note.ts | 51 + service/gitlab/repository.ts | 27 + service/netTool.ts | 2 +- ...4ce4c791e6f91cf40117d4a85785c6b-audit.json | 15 + test/manageGitlabEventReq.test.ts | 5 +- test/manageMrEvent.test.ts | 38 + test/parseReview.test.ts | 32 + test/pathFilter.test.ts | 28 + test/service/discussion.test.ts | 43 + test/service/mr.test.ts | 15 + test/service/note.test.ts | 41 + types/gitlab.ts | 38 + utils/chatTools.ts | 32 + utils/pathTools.ts | 19 + utils/tokenTools.ts | 19 + 37 files changed, 3925 insertions(+), 15 deletions(-) create mode 100644 controllers/manageMrEvent/index.ts create mode 100644 controllers/manageMrEvent/reviewFiles.ts create mode 100644 controllers/manageMrEvent/summaryFiles.ts create mode 100644 controllers/manageMrEvent/summaryMr.ts create mode 100644 controllers/manageMrEvent/utils/commenter.ts create mode 100644 controllers/manageMrEvent/utils/diffTools.ts create mode 100644 controllers/manageMrEvent/utils/inputs.ts create mode 100644 controllers/manageMrEvent/utils/pathFilter.ts create mode 100644 controllers/manageMrEvent/utils/prompts.ts create mode 100644 log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json create mode 100644 log/index.ts create mode 100644 script/mr/changes.json create mode 100644 script/mr/comments.json create mode 100644 script/mr/event.json create mode 100644 service/gitlab/discussions.ts create mode 100644 service/gitlab/note.ts create mode 100644 service/gitlab/repository.ts create mode 100644 test/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json create mode 100644 test/manageMrEvent.test.ts create mode 100644 test/parseReview.test.ts create mode 100644 test/pathFilter.test.ts create mode 100644 test/service/discussion.test.ts create mode 100644 test/service/mr.test.ts create mode 100644 test/service/note.test.ts create mode 100644 utils/chatTools.ts create mode 100644 utils/tokenTools.ts diff --git a/.vscode/settings.json b/.vscode/settings.json index eef5140..a49fc88 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,12 +8,17 @@ "cloudml", "commitlint", "dbaeumer", + "deepseek", "devcontainers", "eamodio", "esbenp", + "gitbeaker", "Gruntfuggly", + "Hasher", + "langchain", "micr", "mioffice", + "openai", "oxlint", "tseslint", "wlpbbgiky", diff --git a/bun.lockb b/bun.lockb index 2ea389c0e86726047df63730c4f6d2b7d03d2732..1be43067bf09764892e5bd812ff2a5eccf7d5f75 100755 GIT binary patch delta 41506 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 delta 19993 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 MT-nelt6ru512|n58vp { + return ( + event.event_type === "merge_request" && + event.object_attributes?.state === "opened" && + !event.object_attributes?.changes + ) +} + +/** + * 处理原始事件 + * @param {Gitlab.MergeRequestEvent} mergeRequest - 合并请求事件 + * @param {Logger} logger - 日志记录器 + * @returns {Promise} - 处理结果 + */ +const manageRawEvent = async ( + mergeRequest: Gitlab.MergeRequestEvent, + logger: Logger +): Promise => { + // 如果MR不是打开或重新打开状态，则不处理 + const isOnCreateMr = filterEvent(mergeRequest) + logger.info(`isOnCreateMr: ${isOnCreateMr}`) + if (!isOnCreateMr) return netTool.ok() + // 获取最新的MR Version + const versions = await service.gitlab.mr.getDiffVersions( + mergeRequest.project.id, + mergeRequest.object_attributes.iid + ) + if (versions.length === 0) { + logger.error("Failed to get MR versions") + return netTool.serverError("Failed to get MR versions") + } + const latestVersion = versions[0] + logger.debug(`latestVersion: ${JSON.stringify(latestVersion)}`) + // 获取MR的全部修改 + const changes = await service.gitlab.mr.getChanges( + mergeRequest.project.id, + mergeRequest.object_attributes.iid + ) + logger.debug(`changes: ${JSON.stringify(changes)}`) + // 如果MR的全部修改不存在，则不处理 + if (!changes) { + logger.error("Failed to get MR changes") + return netTool.serverError("Failed to get MR changes") + } + // 如果MR的描述中包含'skip review'，则不处理 + if (changes.description.includes("skip review")) { + logger.info("Skip review") + return netTool.ok() + } + // 创建路径过滤器 + const pathFilter = new PathFilter([ + "**/*.css", + "**/*.less", + "**/*.scss", + "**/*.js", + "**/*.jsx", + "**/*.ts", + "**/*.tsx", + ]) + // 获取MR的文件修改，并过滤出需要处理的文件 + const files = changes.changes.filter( + (change) => + pathFilter.check(change.new_path) && + !change.deleted_file && + !change.renamed_file && + change.diff + ) + // 如果没有需要处理的文件，则不处理 + if (files.length === 0) { + logger.info("No files need to be processed") + return netTool.ok() + } + // 创建Commenter实例 + const commenter = new Commenter( + latestVersion.base_commit_sha, + latestVersion.head_commit_sha, + latestVersion.start_commit_sha, + mergeRequest.project.id, + mergeRequest.object_attributes.iid, + logger + ) + // 发起loading评论，无所谓是否成功 + await commenter.createLoadingComment() + + // 创建输入实例 + const inputs: Inputs = new Inputs() + // 获取MR的标题和描述 + inputs.title = changes.title + inputs.description = changes.description || "暂无描述" + + // 对文件进行总结 + const { summarizedFileMap, needReviewFileMap } = await summaryFiles( + files, + true, + inputs, + logger + ) + // 如果总结完的文件Map为空，则不处理 + if (summarizedFileMap.size === 0) { + logger.info("No summarized files") + await commenter.modifyLoadingOrCreateComment("没有需要审查的文件") + return netTool.ok() + } + // 总结MR + const summarizedMr = await summaryMr(summarizedFileMap, inputs, logger) + // 如果总结MR为空，则不处理 + if (!summarizedMr) { + logger.info("No summarized Mr") + await commenter.modifyLoadingOrCreateComment("没有生成整体的总结") + return netTool.ok() + } + // 更新输入实例短总结 + inputs.shortSummary = summarizedMr + // 发送总结评论 + 文件变更 + await commenter.createSummarizedComment(summarizedMr, summarizedFileMap) + // 过滤出需要审查的文件 + const needReviewFiles = files.filter( + (file) => needReviewFileMap.get(file.new_path) || false + ) + // 如果需要审查的文件为空，则不处理 + if (needReviewFiles.length === 0) { + logger.info("No need review files") + await commenter.createComment("没有需要审查的文件") + return netTool.ok() + } + // 对需要审查的文件进行审查 + await reviewFiles(needReviewFiles, inputs, commenter, logger) + return netTool.ok() +} + +const manageMrEvent = { + manageRawEvent, +} + +export default manageMrEvent diff --git a/controllers/manageMrEvent/reviewFiles.ts b/controllers/manageMrEvent/reviewFiles.ts new file mode 100644 index 0000000..09dbebc --- /dev/null +++ b/controllers/manageMrEvent/reviewFiles.ts @@ -0,0 +1,152 @@ +import { CommitDiffSchema } from "@gitbeaker/rest" +import pLimit from "p-limit" +import { Logger } from "winston" + +import chatTools from "../../utils/chatTools" +import tokenTools from "../../utils/tokenTools" +import Commenter from "./utils/commenter" +import diffTools, { Review } from "./utils/diffTools" +import { Inputs } from "./utils/inputs" +import { Prompts } from "./utils/prompts" + +/** + * 审查需要审查的文件列表，并生成评论。 + * @param {CommitDiffSchema[]} needReviewFiles - 需要审查的文件列表。 + * @param {Inputs} rawInput - 原始输入。 + * @param {Commenter} commenter - 评论工具实例。 + * @param {Logger} logger - 日志记录器。 + * @returns {Promise} 返回一个Promise，表示审查过程的完成。 + */ +const reviewFiles = async ( + needReviewFiles: CommitDiffSchema[], + rawInput: Inputs, + commenter: Commenter, + logger: Logger +) => { + const prompts = new Prompts() + + // 创建一个Map来存储文件的差异信息 + const diffsFileMap = new Map() + + // 解析每个文件的差异并存储在diffsFileMap中 + needReviewFiles.forEach((file) => { + const diffs = diffTools.parseFileDiffs(file) + const fileDiff = diffsFileMap.get(file.new_path) || [] + diffsFileMap.set(file.new_path, fileDiff.concat(diffs)) + }) + + logger.debug(`diffsFileMap: ${JSON.stringify([...diffsFileMap])}`) + + // 如果没有需要审查的文件，记录日志并创建评论 + if (diffsFileMap.size === 0) { + logger.info("No files need review") + commenter.createComment("没有需要审查的文件") + return + } + + const skippedFiles: string[] = [] + const fileCRResultsMap = new Map() + + /** + * 审查单个文件的差异。 + * @param {Array} diff - 文件的差异数组。 + * @param {string} filename - 文件名。 + * @returns {Promise} 返回一个Promise，表示审查过程的完成。 + */ + const doFileReview = async ( + diff: [number, number, string][], + filename: string + ) => { + logger.info(`Reviewing ${filename}`) + const inputs = rawInput.clone() + inputs.filename = filename + let tokens = tokenTools.getTokenCount(prompts.renderReviewFileDiff(inputs)) + + // 计算并打包文件的差异，确保令牌数不超过限制 + const packedFileCount = diff.findIndex((d, idx) => { + const hunk = d[2] + if (tokens + tokenTools.getTokenCount(hunk) > 100 * 1000) { + logger.info( + `only packing ${idx} / ${diff.length} diffs, tokens: ${tokens} / ${100 * 1000}` + ) + return true + } + inputs.patches += ` +${hunk} +` + tokens += tokenTools.getTokenCount(hunk) + return false + }) + + // 如果没有打包任何差异，跳过该文件 + if (packedFileCount === 0) { + logger.info(`skipping ${filename}`) + skippedFiles.push(filename) + return + } + + // 获取GPT-4模型并生成审查提示 + const codeChatBot = await chatTools.getGpt4oModel(0) + const reviewPrompt = prompts.renderReviewFileDiff(inputs) + logger.debug(`reviewPrompt for ${filename}: ${reviewPrompt}`) + try { + const { content: review } = await codeChatBot.invoke(reviewPrompt) + if (!review) throw new Error("Empty review") + logger.info(`review for ${filename}: ${review}`) + + // 解析审查结果并过滤需要评论的审查 + const reviews = diffTools.parseReview(review as string, diff) + logger.debug(`reviews for ${filename}: ${JSON.stringify(reviews)}`) + const needCommentReviews = reviews.filter( + (r) => !r.comment.includes("LGTM") + ) + fileCRResultsMap.set(filename, needCommentReviews) + } catch { + logger.error(`Failed to review ${filename}`) + } + } + + /** + * 创建评论。 + * @param {string} filename - 文件名。 + * @param {Review} reviews - 审查结果。 + * @returns {Promise} 返回一个Promise，表示评论过程的完成。 + */ + const doComment = async (filename: string, reviews: Review) => { + const file = needReviewFiles.find((f) => f.new_path === filename) + if (!file) { + logger.error(`Failed to find file ${filename}`) + return + } + await commenter.createReviewComment( + file.new_path, + file.old_path, + reviews.startLine, + reviews.endLine, + reviews.comment + ) + } + + // 使用pLimit限制并发审查文件的数量 + const limit = pLimit(10) + await Promise.allSettled( + [...diffsFileMap].map(([filename, diffs]) => + limit(() => doFileReview(diffs, filename)) + ) + ) + + // 把fileCRResultsMap中的needCommentReviews拍平成一个数组 + const needCommentReviews: { filename: string; reviews: Review }[] = [] + fileCRResultsMap.forEach((reviews, filename) => { + reviews.forEach((r) => needCommentReviews.push({ filename, reviews: r })) + }) + + // 创建评论 + await Promise.allSettled( + needCommentReviews.map(({ filename, reviews }) => + limit(() => doComment(filename, reviews)) + ) + ) +} + +export default reviewFiles diff --git a/controllers/manageMrEvent/summaryFiles.ts b/controllers/manageMrEvent/summaryFiles.ts new file mode 100644 index 0000000..6c59e04 --- /dev/null +++ b/controllers/manageMrEvent/summaryFiles.ts @@ -0,0 +1,126 @@ +import { CommitDiffSchema } from "@gitbeaker/rest" +import pLimit from "p-limit" +import { Logger } from "winston" + +import chatTools from "../../utils/chatTools" +import tokenTools from "../../utils/tokenTools" +import { Inputs } from "./utils/inputs" +import { Prompts } from "./utils/prompts" + +/** + * 对文件进行总结 + * @param {CommitDiffSchema[]} files - 要总结的文件 + * @param {boolean} needReview - 是否审查简单更改 + * @param {Inputs} rawInputs - 原始输入 + * @param {Prompts} prompts - 提示 + * @param {Logger} logger - 日志记录器 + * @returns {Promise<{ summarizedFileMap: Map, needReviewFileMap: Map }>} 返回包含总结和需要审查的文件Map的Promise + */ +const summaryFiles = async ( + files: CommitDiffSchema[], + needReview: boolean, + rawInputs: Inputs, + logger: Logger +) => { + // 生成Prompts实例 + const prompts: Prompts = new Prompts() + // 按文件名融合Diff + const fileMap = new Map() + const DIFF_SEPARATOR = "\n--- DIFF SEPARATOR ---\n" + + files.forEach((file) => { + const rawDiff = fileMap.get(file.new_path) || "" + // 融合Diff + const diff = rawDiff ? rawDiff + DIFF_SEPARATOR + file.diff : file.diff + fileMap.set(file.new_path, diff) + }) + + // 总结后的文件Map + const summarizedFileMap = new Map() + + /** + * 生成文件的Summary + * @param {string} diff - 文件的差异 + * @param {string} path - 文件路径 + * @returns {Promise} 返回生成Summary的Promise + */ + const doFileSummary = async (diff: string, path: string) => { + const inputs = rawInputs.clone() + inputs.fileDiff = diff + inputs.filename = path + const summarizePrompt = prompts.renderSummarizeFileDiff(inputs, needReview) + logger.debug(`summarizePrompt for ${path}: ${summarizePrompt}`) + const tokens = tokenTools.getTokenCount(summarizePrompt) + logger.debug(`tokens for ${path}: ${tokens}`) + if (tokens > 100 * 1000) { + logger.error( + `File diff too long for ${path} (${tokens} tokens), skipping` + ) + return + } + const codeChatBot = await chatTools.getGpt4oModel(0) + try { + const { content: summarize } = await codeChatBot.invoke(summarizePrompt) + if (!summarize) throw new Error("Empty summarize") + logger.info(`summarize for ${path}: ${summarize}`) + summarizedFileMap.set(path, summarize as string) + } catch { + logger.error(`Failed to summarize for ${path}`) + } + } + + const limit = pLimit(5) + const promises = Array.from(fileMap.entries()).map(([path, diff]) => + limit(() => doFileSummary(diff, path)) + ) + await Promise.allSettled(promises) + + // 需要Review的文件Map + const needReviewFileMap = new Map() + + // 如果不需要审查更改，则直接返回 + if (!needReview) + return { + summarizedFileMap, + needReviewFileMap, + } + + /** + * 管理文件的审查状态 + * @param {string} path - 文件路径 + * @param {string} summarize - 文件总结 + */ + const manageTriage = (path: string, summarize: string) => { + const triageRegex = /\[TRIAGE\]:\s*(NEEDS_REVIEW|APPROVED)/ + const triageMatch = summarize.match(triageRegex) + // 如果没有匹配到TRIAGE，打印错误日志 + if (!triageMatch) { + logger.error(`Failed to triage for ${path}`) + needReviewFileMap.set(path, true) + return + } + // 如果匹配到TRIAGE，根据匹配结果设置needReviewFileMap + if (triageMatch[1] === "APPROVED") { + logger.info(`Approved for ${path}`) + needReviewFileMap.set(path, false) + } else { + logger.info(`Needs review for ${path}`) + needReviewFileMap.set(path, true) + } + // 删除源总结中的TRIAGE + const newSummarize = summarize.replace(triageRegex, "").trim() + summarizedFileMap.set(path, newSummarize) + } + + // 全部文件过一遍TRIAGE + Array.from(summarizedFileMap.entries()).forEach(([path, summarize]) => + manageTriage(path, summarize) + ) + + return { + summarizedFileMap, + needReviewFileMap, + } +} + +export default summaryFiles diff --git a/controllers/manageMrEvent/summaryMr.ts b/controllers/manageMrEvent/summaryMr.ts new file mode 100644 index 0000000..1d35f30 --- /dev/null +++ b/controllers/manageMrEvent/summaryMr.ts @@ -0,0 +1,56 @@ +import { Logger } from "winston" + +import chatTools from "../../utils/chatTools" +import { Inputs } from "./utils/inputs" +import { Prompts } from "./utils/prompts" + +/** + * 总结合并请求的变更。 + * @param {Map} summarizedFileMap - 一个包含文件路径和对应摘要的Map。 + * @param {Inputs} rawInputs - 输入数据的实例。 + * @param {Logger} logger - 用于记录日志的Logger实例。 + * @returns {Promise} 返回包含总结的Promise字符串。 + */ +const summaryMr = async ( + summarizedFileMap: Map, + rawInputs: Inputs, + logger: Logger +) => { + // 创建Prompts实例 + const prompts = new Prompts() + // 克隆输入数据 + const inputs = rawInputs.clone() + + // 遍历summarizedFileMap，将每个文件的摘要添加到rawSummary中 + summarizedFileMap.forEach((summarize, path) => { + inputs.rawSummary += `--- + ${path}: ${summarize} + ` + }) + // 记录完整的变更日志 + logger.debug(`full changes: ${inputs.rawSummary}`) + + // 渲染总结提示 + const summarizePrompt = prompts.renderSummarize(inputs) + + // 记录总结提示日志 + logger.debug(`summarizePrompt for Mr: ${summarizePrompt}`) + + // 获取GPT-4o模型实例 + const codeChatBot = await chatTools.getGpt4oModel(0) + + try { + // 调用模型生成总结 + const { content: summarize } = await codeChatBot.invoke(summarizePrompt) + if (!summarize) throw new Error("Empty summarize") + // 记录总结日志 + logger.debug(`summarize for Mr: ${summarize}`) + return summarize as string + } catch { + // 记录错误日志 + logger.error(`Failed to summarize for Mr`) + return "" + } +} + +export default summaryMr diff --git a/controllers/manageMrEvent/utils/commenter.ts b/controllers/manageMrEvent/utils/commenter.ts new file mode 100644 index 0000000..cfcec64 --- /dev/null +++ b/controllers/manageMrEvent/utils/commenter.ts @@ -0,0 +1,221 @@ +import { MergeRequestNoteSchema } from "@gitbeaker/rest" +import { Logger } from "winston" + +import service from "../../../service" +import { CreateRangeDiscussionPosition } from "../../../service/gitlab/discussions" +import { shortenPath } from "../../../utils/pathTools" + +/** + * Gitlab评论控制器 + */ +export class Commenter { + private base_sha: string + private head_sha: string + private start_sha: string + private project_id: number + private merge_request_iid: number + private loadingComment: MergeRequestNoteSchema | null = null + private comments: MergeRequestNoteSchema[] = [] + private logger: Logger + + constructor( + base_sha: string, + head_sha: string, + start_sha: string, + project_id: number, + merge_request_iid: number, + logger: Logger + ) { + this.base_sha = base_sha + this.head_sha = head_sha + this.start_sha = start_sha + this.project_id = project_id + this.merge_request_iid = merge_request_iid + this.logger = logger + } + + /** + * 获取所有评论 + * @returns {Promise} 返回评论列表 + */ + async getComments() { + // 如果评论列表已经存在，直接返回 + if (this.comments.length > 0) { + return this.comments + } + const commentList: MergeRequestNoteSchema[] = [] + let page = 1 + const per_page = 100 + while (true) { + // 从 GitLab 服务获取评论 + const comments = await service.gitlab.mr.getComments( + this.project_id, + this.merge_request_iid, + page, + per_page + ) + commentList.push(...comments) + page++ + // 如果获取的评论数量少于每页数量，说明已经获取完毕，退出循环 + if (comments.length < per_page) { + break + } + } + this.comments = commentList + return commentList + } + + /** + * 创建评论 + * @param {string} body 评论内容 + * @returns {Promise} 返回创建的评论 + */ + async createComment(body: string) { + // 调用 GitLab 服务创建评论 + const res = await service.gitlab.note.create2Mr( + this.project_id, + this.merge_request_iid, + body + ) + if (!res) { + this.logger.error("Failed to create comment") + } + return res + } + + /** + * 创建加载中的评论 + * @returns {Promise} + */ + async createLoadingComment() { + const body = "小煎蛋正在处理您的合并请求，请稍等片刻。" + // 调用 GitLab 服务创建加载中的评论 + const res = await service.gitlab.note.create2Mr( + this.project_id, + this.merge_request_iid, + body + ) + if (!res) { + this.logger.error("Failed to create loading comment") + } + this.loadingComment = res + } + + /** + * 修改加载中的评论 + * @param {string} body 新的评论内容 + * @returns {Promise} 返回修改后的评论 + */ + async modifyLoadingComment(body: string) { + if (!this.loadingComment) { + this.logger.error("No loading comment to modify") + return + } + // 调用 GitLab 服务修改加载中的评论 + const res = await service.gitlab.note.modify2Mr( + this.project_id, + this.merge_request_iid, + this.loadingComment.id, + body + ) + if (!res) { + this.logger.error("Failed to modify loading comment") + } + return res + } + + /** + * 修改加载中的评论，如果失败则创建新的评论。 + * @param {string} body - 评论内容。 + * @returns {Promise} 返回修改或创建的评论。 + */ + async modifyLoadingOrCreateComment(body: string) { + if (this.loadingComment) { + const res = await this.modifyLoadingComment(body) + if (res) return res + } + return this.createComment(body) + } + + /** + * 创建总结评论 + * @param {string} summarizedMr 合并请求的总结 + * @param {Map} summarizedFileMap 文件变更的总结 + * @returns {Promise} + */ + async createSummarizedComment( + summarizedMr: string, + summarizedFileMap: Map + ) { + // 构建总结评论的内容 + const summarizedComment = ` +# 整体摘要： +${summarizedMr} + +# 文件变更： +| 文件路径 | 变更摘要 | +| --- | --- | +${[...summarizedFileMap] + .map(([path, summary]) => `| \`${shortenPath(path)}\` | ${summary} |`) + .join("\n")} + ` + this.logger.debug(`Summarized comment: ${summarizedComment}`) + // 尝试修改加载中的评论，如果失败则创建新的评论 + const res = await this.modifyLoadingOrCreateComment(summarizedComment) + if (!res) { + this.logger.error("Failed to create summarized comment") + } + } + + /** + * 创建审查评论 + * @param {string} new_path 新文件路径 + * @param {string} old_path 旧文件路径 + * @param {number} start_line 开始行 + * @param {number} end_line 结束行 + * @param {string} content 评论内容 + * @returns {Promise} + */ + async createReviewComment( + new_path: string, + old_path: string, + start_line: number, + end_line: number, + content: string + ) { + // 计算文件路径的 SHA1 哈希值 + const hasher = new Bun.CryptoHasher("sha1") + hasher.update(new_path) + const fileSha = hasher.digest("hex") + // 构建评论的位置对象 + const position: CreateRangeDiscussionPosition = { + base_sha: this.base_sha, + start_sha: this.start_sha, + head_sha: this.head_sha, + new_path, + old_path, + position_type: "text", + new_line: end_line, + line_range: { + start: { + line_code: `${fileSha}_0_${end_line}`, + }, + end: { + line_code: `${fileSha}_0_${end_line}`, + }, + }, + } + // 调用 GitLab 服务创建审查评论 + const res = await service.gitlab.discussions.create2Mr( + this.project_id, + this.merge_request_iid, + content, + position + ) + if (!res) { + this.logger.error("Failed to create review comment") + } + } +} + +export default Commenter diff --git a/controllers/manageMrEvent/utils/diffTools.ts b/controllers/manageMrEvent/utils/diffTools.ts new file mode 100644 index 0000000..d51c6c0 --- /dev/null +++ b/controllers/manageMrEvent/utils/diffTools.ts @@ -0,0 +1,342 @@ +import { CommitDiffSchema } from "@gitbeaker/rest" + +/** + * 将diff字符串拆分为多个块。 + * @param {string | null | undefined} diff - 包含diff内容的字符串。 + * @returns {string[]} 返回包含diff块的字符串数组。 + */ +const splitDiff = (diff: string | null | undefined): string[] => { + if (diff == null) { + return [] + } + + const pattern = /(^@@ -(\d+),(\d+) \+(\d+),(\d+) @@).*$/gm + + const result: string[] = [] + let last = -1 + let match: RegExpExecArray | null + while ((match = pattern.exec(diff)) !== null) { + if (last === -1) { + last = match.index + } else { + result.push(diff.substring(last, match.index)) + last = match.index + } + } + if (last !== -1) { + result.push(diff.substring(last)) + } + return result +} + +/** + * 获取diff块的起始和结束行号。 + * @param {string} diff - 包含diff内容的字符串。 + * @returns {object | null} 返回包含旧块和新块起始和结束行号的对象，或返回null。 + */ +const getStartEndLine = ( + diff: string +): { + oldHunk: { startLine: number; endLine: number } + newHunk: { startLine: number; endLine: number } +} | null => { + const pattern = /(^@@ -(\d+),(\d+) \+(\d+),(\d+) @@)/gm + const match = pattern.exec(diff) + if (match != null) { + const oldBegin = parseInt(match[2]) + const oldDiff = parseInt(match[3]) + const newBegin = parseInt(match[4]) + const newDiff = parseInt(match[5]) + return { + oldHunk: { + startLine: oldBegin, + endLine: oldBegin + oldDiff - 1, + }, + newHunk: { + startLine: newBegin, + endLine: newBegin + newDiff - 1, + }, + } + } else { + return null + } +} + +/** + * 解析diff字符串，返回旧块和新块的内容。 + * @param {string} diff - 包含diff内容的字符串。 + * @returns {object | null} 返回包含旧块和新块内容的对象，或返回null。 + */ +export const parseDiff = ( + diff: string +): { oldHunk: string; newHunk: string } | null => { + const hunkInfo = getStartEndLine(diff) + if (hunkInfo == null) { + return null + } + + const oldHunkLines: string[] = [] + const newHunkLines: string[] = [] + + let newLine = hunkInfo.newHunk.startLine + + const lines = diff.split("\n").slice(1) // 跳过@@行 + + // 如果最后一行为空，则移除 + if (lines[lines.length - 1] === "") { + lines.pop() + } + + // 跳过前3行和后3行的注释 + const skipStart = 3 + const skipEnd = 3 + + let currentLine = 0 + + const removalOnly = !lines.some((line) => line.startsWith("+")) + + for (const line of lines) { + currentLine++ + if (line.startsWith("-")) { + oldHunkLines.push(`${line.substring(1)}`) + } else if (line.startsWith("+")) { + newHunkLines.push(`${newLine}: ${line.substring(1)}`) + newLine++ + } else { + // 上下文行 + oldHunkLines.push(`${line}`) + if ( + removalOnly || + (currentLine > skipStart && currentLine <= lines.length - skipEnd) + ) { + newHunkLines.push(`${newLine}: ${line}`) + } else { + newHunkLines.push(`${line}`) + } + newLine++ + } + } + + return { + oldHunk: oldHunkLines.join("\n"), + newHunk: newHunkLines.join("\n"), + } +} + +/** + * 解析文件的diff信息，返回包含起始行号、结束行号和hunk内容的数组。 + * @param {CommitDiffSchema} file - 包含文件diff信息的对象。 + * @returns {[number, number, string][]} 返回包含起始行号、结束行号和hunk内容的数组。 + */ +const parseFileDiffs = (file: CommitDiffSchema): [number, number, string][] => { + // 获取文件的Diff，一个文件的Diff可能包含多个Hunk + const diffs = diffTools.splitDiff(file.diff) + if (diffs.length === 0) return [] + return diffs + .map((diff) => { + const diffLines = diffTools.getStartEndLine(diff) + if (!diffLines) return null + const hunks = diffTools.parseDiff(diff) + if (!hunks) return null + const hunksStr = ` +---new_hunk--- +\`\`\` +${hunks.newHunk} +\`\`\` + +---old_hunk--- +\`\`\` +${hunks.oldHunk} +\`\`\` + ` + return [ + diffLines.newHunk.startLine, + diffLines.newHunk.endLine, + hunksStr, + ] as [number, number, string] + }) + .filter((diff) => diff !== null) +} + +export interface Review { + startLine: number + endLine: number + comment: string +} + +/** + * 解析审查评论的函数 + * @param {string} response - 审查评论的响应字符串 + * @param {Array<[number, number, string]>} diffs - 差异数组，每个差异包含开始行号、结束行号和差异内容 + * @returns {Review[]} - 返回解析后的审查评论数组 + */ +const parseReview = ( + response: string, + diffs: Array<[number, number, string]> +): Review[] => { + /** + * 存储当前的审查评论 + */ + const storeReview = (): void => { + if (currentStartLine !== null && currentEndLine !== null) { + const review: Review = { + startLine: currentStartLine, + endLine: currentEndLine, + comment: currentComment, + } + + let withinDiff = false + let bestDiffStartLine = -1 + let bestDiffEndLine = -1 + let maxIntersection = 0 + + // 查找与当前审查评论行号范围重叠最多的差异 + for (const [startLine, endLine] of diffs) { + const intersectionStart = Math.max(review.startLine, startLine) + const intersectionEnd = Math.min(review.endLine, endLine) + const intersectionLength = Math.max( + 0, + intersectionEnd - intersectionStart + 1 + ) + + if (intersectionLength > maxIntersection) { + maxIntersection = intersectionLength + bestDiffStartLine = startLine + bestDiffEndLine = endLine + withinDiff = + intersectionLength === review.endLine - review.startLine + 1 + } + + if (withinDiff) break + } + + // 如果审查评论不在任何差异范围内，进行相应处理 + if (!withinDiff) { + if (bestDiffStartLine !== -1 && bestDiffEndLine !== -1) { + review.comment = `> 注意：此CR评论不在差异范围内，因此被映射到重叠最多的Diff。原始行号 [${review.startLine}-${review.endLine}] + + ${review.comment}` + review.startLine = bestDiffStartLine + review.endLine = bestDiffEndLine + } else { + review.comment = `> 注意：此CR评论不在差异范围内，但未找到与其重叠的Diff。原始行号 [${review.startLine}-${review.endLine}] + + ${review.comment}` + review.startLine = diffs[0][0] + review.endLine = diffs[0][1] + } + } + + reviews.push(review) + } + } + + /** + * 清理代码块中的行号 + * @param {string} comment - 评论字符串 + * @param {string} codeBlockLabel - 代码块标签 + * @returns {string} - 返回清理后的评论字符串 + */ + const sanitizeCodeBlock = ( + comment: string, + codeBlockLabel: string + ): string => { + const codeBlockStart = `\`\`\`${codeBlockLabel}` + const codeBlockEnd = "```" + const lineNumberRegex = /^ *(\d+): /gm + + let codeBlockStartIndex = comment.indexOf(codeBlockStart) + + while (codeBlockStartIndex !== -1) { + const codeBlockEndIndex = comment.indexOf( + codeBlockEnd, + codeBlockStartIndex + codeBlockStart.length + ) + + if (codeBlockEndIndex === -1) break + + const codeBlock = comment.substring( + codeBlockStartIndex + codeBlockStart.length, + codeBlockEndIndex + ) + const sanitizedBlock = codeBlock.replace(lineNumberRegex, "") + + comment = + comment.slice(0, codeBlockStartIndex + codeBlockStart.length) + + sanitizedBlock + + comment.slice(codeBlockEndIndex) + + codeBlockStartIndex = comment.indexOf( + codeBlockStart, + codeBlockStartIndex + + codeBlockStart.length + + sanitizedBlock.length + + codeBlockEnd.length + ) + } + + return comment + } + + /** + * 清理响应字符串中的代码块 + * @param {string} comment - 评论字符串 + * @returns {string} - 返回清理后的评论字符串 + */ + const sanitizeResponse = (comment: string): string => { + comment = sanitizeCodeBlock(comment, "suggestion") + comment = sanitizeCodeBlock(comment, "diff") + return comment + } + const reviews: Review[] = [] + + // 清理响应字符串 + response = sanitizeResponse(response.trim()) + + const lines = response.split("\n") + const lineNumberRangeRegex = /(?:^|\s)(\d+)-(\d+):\s*$/ + const commentSeparator = "---" + + let currentStartLine: number | null = null + let currentEndLine: number | null = null + let currentComment = "" + + // 解析响应字符串中的每一行 + for (const line of lines) { + const lineNumberRangeMatch = line.match(lineNumberRangeRegex) + + if (lineNumberRangeMatch != null) { + storeReview() + currentStartLine = parseInt(lineNumberRangeMatch[1], 10) + currentEndLine = parseInt(lineNumberRangeMatch[2], 10) + currentComment = "" + continue + } + + if (line.trim() === commentSeparator) { + storeReview() + currentStartLine = null + currentEndLine = null + currentComment = "" + continue + } + + if (currentStartLine !== null && currentEndLine !== null) { + currentComment += `${line}\n` + } + } + + storeReview() + + return reviews +} + +const diffTools = { + splitDiff, + parseDiff, + getStartEndLine, + parseFileDiffs, + parseReview, +} + +export default diffTools diff --git a/controllers/manageMrEvent/utils/inputs.ts b/controllers/manageMrEvent/utils/inputs.ts new file mode 100644 index 0000000..5877537 --- /dev/null +++ b/controllers/manageMrEvent/utils/inputs.ts @@ -0,0 +1,128 @@ +/** + * 生成系统消息，包含知识截止日期和当前日期。 + * @returns {string} 返回包含系统消息的字符串。 + */ +const genSystemMessage = () => { + return ` +知识截止日期: 2023-12-01 +当前日期: ${new Date().toISOString().split("T")[0]} + +重要提示: 整个回复必须使用ISO代码为zh的语言 + ` +} + +/** + * Inputs类用于存储和处理各种输入数据。 + */ +export class Inputs { + systemMessage: string + title: string + description: string + rawSummary: string + shortSummary: string + filename: string + fileContent: string + fileDiff: string + patches: string + diff: string + commentChain: string + comment: string + + /** + * 构造函数，初始化Inputs类的实例。 + * @param {string} [systemMessage=""] - 系统消息。 + * @param {string} [title="no title provided"] - 标题。 + * @param {string} [description="no description provided"] - 描述。 + * @param {string} [rawSummary=""] - 原始摘要。 + * @param {string} [shortSummary=""] - 简短摘要。 + * @param {string} [filename=""] - 文件名。 + * @param {string} [fileContent="file contents cannot be provided"] - 文件内容。 + * @param {string} [fileDiff="file diff cannot be provided"] - 文件差异。 + * @param {string} [patches=""] - 补丁。 + * @param {string} [diff="no diff"] - 差异。 + * @param {string} [commentChain="no other comments on this patch"] - 评论链。 + * @param {string} [comment="no comment provided"] - 评论。 + */ + constructor( + systemMessage = "", + title = "no title provided", + description = "no description provided", + rawSummary = "", + shortSummary = "", + filename = "", + fileContent = "file contents cannot be provided", + fileDiff = "file diff cannot be provided", + patches = "", + diff = "no diff", + commentChain = "no other comments on this patch", + comment = "no comment provided" + ) { + this.systemMessage = systemMessage || genSystemMessage() + this.title = title + this.description = description + this.rawSummary = rawSummary + this.shortSummary = shortSummary + this.filename = filename + this.fileContent = fileContent + this.fileDiff = fileDiff + this.patches = patches + this.diff = diff + this.commentChain = commentChain + this.comment = comment + } + + /** + * 克隆当前Inputs实例。 + * @returns {Inputs} 返回当前对象的副本。 + */ + clone(): Inputs { + return new Inputs( + this.systemMessage, + this.title, + this.description, + this.rawSummary, + this.shortSummary, + this.filename, + this.fileContent, + this.fileDiff, + this.patches, + this.diff, + this.commentChain, + this.comment + ) + } + + /** + * 渲染内容，将占位符替换为实际值。 + * @param {string} content - 包含占位符的内容。 + * @returns {string} 返回替换后的内容。 + */ + render(content: string): string { + if (!content) { + return "" + } + + const replacements = { + $system_message: this.systemMessage, + $title: this.title, + $description: this.description, + $raw_summary: this.rawSummary, + $short_summary: this.shortSummary, + $filename: this.filename, + $file_content: this.fileContent, + $file_diff: this.fileDiff, + $patches: this.patches, + $diff: this.diff, + $comment_chain: this.commentChain, + $comment: this.comment, + } + + for (const [key, value] of Object.entries(replacements)) { + if (value) { + content = content.replace(key, value) + } + } + + return content + } +} diff --git a/controllers/manageMrEvent/utils/pathFilter.ts b/controllers/manageMrEvent/utils/pathFilter.ts new file mode 100644 index 0000000..196abcc --- /dev/null +++ b/controllers/manageMrEvent/utils/pathFilter.ts @@ -0,0 +1,60 @@ +import { minimatch } from "minimatch" + +export class PathFilter { + // rules数组包含一组规则，每个规则是一个元组，元组的第一个元素是规则字符串，第二个元素是布尔值，表示是否排除 + private readonly rules: Array<[string /* rule */, boolean /* exclude */]> + + /** + * 构造函数，接受一个字符串数组作为规则 + * @param rules - 包含路径匹配规则的字符串数组 + */ + constructor(rules: string[] | null = null) { + this.rules = [] + if (rules != null) { + for (const rule of rules) { + const trimmed = rule?.trim() // 去除规则字符串的前后空格 + if (trimmed) { + if (trimmed.startsWith("!")) { + // 如果规则以'!'开头，表示排除规则 + this.rules.push([trimmed.substring(1).trim(), true]) + } else { + // 否则表示包含规则 + this.rules.push([trimmed, false]) + } + } + } + } + } + + /** + * 检查给定路径是否符合规则 + * @param path - 需要检查的路径 + * @returns boolean - 如果路径符合规则返回true，否则返回false + */ + check(path: string): boolean { + if (this.rules.length === 0) { + return true // 如果没有规则，默认返回true + } + + let included = false // 标记路径是否被包含 + let excluded = false // 标记路径是否被排除 + let inclusionRuleExists = false // 标记是否存在包含规则 + + for (const [rule, exclude] of this.rules) { + if (minimatch(path, rule)) { + // 使用minimatch库检查路径是否匹配规则 + if (exclude) { + excluded = true // 如果匹配排除规则，设置excluded为true + } else { + included = true // 如果匹配包含规则，设置included为true + } + } + if (!exclude) { + inclusionRuleExists = true // 如果存在包含规则，设置inclusionRuleExists为true + } + } + + // 返回值逻辑：如果不存在包含规则或路径被包含且未被排除，则返回true + return (!inclusionRuleExists || included) && !excluded + } +} diff --git a/controllers/manageMrEvent/utils/prompts.ts b/controllers/manageMrEvent/utils/prompts.ts new file mode 100644 index 0000000..d37798e --- /dev/null +++ b/controllers/manageMrEvent/utils/prompts.ts @@ -0,0 +1,206 @@ +import { type Inputs } from "./inputs" + +export class Prompts { + // 总结单文件修改内容 + summarizeFileDiff = ` +$system_message + +## Gitlab 合并请求 标题 + +\`\`\` +$title +\`\`\` + +## 描述 + +\`\`\` +$description +\`\`\` + +## 差异 + +\`\`\`diff +$file_diff +\`\`\` + +## 说明 + +我希望你能简洁地总结这个差异，不超过100个字。 +如果适用，你的总结应包括对导出函数、全局数据结构和变量签名的更改的说明，以及任何可能影响代码外部接口或行为的更改。 +不要返回任何标题，直接回复差异总结。 +` + // 文件是否需要Review + triageFileDiff = `在总结下方，我还希望你根据以下标准将差异分类为\`NEEDS_REVIEW\`或\`APPROVED\`： + +- 如果差异涉及任何逻辑或功能的修改，即使它们看起来很小，也将其分类为\`NEEDS_REVIEW\`。这包括对控制结构、函数调用或变量赋值的更改，这些更改可能会影响代码的行为。 +- 如果差异仅包含不影响代码逻辑的非常小的更改，例如修正拼写错误、格式或为了清晰起见重命名变量、修改引入顺序，将其分类为\`APPROVED\`。 + +请彻底评估差异，并考虑更改行数、对整个系统的潜在影响以及引入新错误或安全漏洞的可能性。 +在有疑问时，总是倾向于谨慎并将差异分类为\`NEEDS_REVIEW\`。 + +你必须严格按照以下格式对差异进行分类： +[TRIAGE]: + +重要提示： +- 返回值不要包含\`\`\`。 +- 在你的总结中不要提到文件需要彻底审核或警告潜在问题。 +- 不要提供任何将差异分类为\`NEEDS_REVIEW\`或\`APPROVED\`的理由。 +- 在总结中不要提到这些更改会影响代码的逻辑或功能。你只能使用上述分类格式来指示。 +` + // 总结前缀 + summarizePrefix = `以下是你为文件生成的更改摘要： + \`\`\` + $raw_summary + \`\`\` + +` + // 总结 + summarize = `你的任务是提供一个简明的合并请求的更改摘要。此摘要将在代码审查时用作提示，必须非常清晰以便AI机器人理解。 + +说明： + +- 返回值不要包含\`\`\`。 +- 仅关注总结合并请求中的更改，并坚持事实。 +- 不要向机器人提供任何关于如何执行审查的说明。 +- 不要提到文件需要彻底审核或警告潜在问题。 +- 不要提到这些更改会影响代码的逻辑或功能。 +- 不要提到任何单独的文件名，在代码审查中这部分会另外提供。 +- 返回纯文本内容，叙述整体的修改，不得超过500字。 +` + // 审查文件差异 + reviewFileDiff = `# Gitlab 合并请求 +## 标题 + +\`$title\` + +## 描述 + +\`\`\` +$description +\`\`\` + +## 更改摘要 + +\`\`\` +$short_summary +\`\`\` + +## 重要说明 +你是一个出类拔萃的CodeReviewer，现在是时候展示你的技能了！ + +输入：带有行号的新hunks和旧hunks（替换的代码）。hunks代表不完整的代码片段。 + +附加上下文：合并请求的标题、描述、摘要和评论链。 + +任务：使用提供的上下文审查新hunks中的实质性问题，并在必要时回复评论。 + +输出：在markdown中使用确切的行号范围进行审查评论。单行评论的起始和结束行号必须相同。必须使用以下示例响应格式： +使用带有相关语言标识符的围栏代码块（fenced code blocks）。 +不要用行号注释代码片段。 +正确格式化和缩进代码。 +不要使用\`suggestion\`代码块。 +对于问题修复： +- 使用\`diff\`代码块，用\`+\`或\`-\`标记更改。带有修复片段的评论的行号范围必须与新hunk中要替换的范围完全匹配。 +- 不要提供一般反馈、更改摘要、变更解释或对良好代码的赞扬。 +- 更多的关注于逻辑错误、边界情况和性能问题。 +- 忽略代码风格问题、引入顺序问题及输出打印等不影响代码功能的问题，除非它们导致错误。 +- 仅专注于根据给定的上下文提供具体、客观的见解，避免对系统潜在影响的广泛评论或质疑更改意图。 +- 如果一个区块反应了多个问题，请一起回复。 + +如果在行范围内没有发现问题，只在审查部分回复纯文本 \`LGTM!\` 。 +且如果返回\`LGTM!\`的行号连续，则可以合并为一个区块。 + +## 示例 + +### 示例更改 + +---new_hunk--- +\`\`\` + z = x / y + return z + +20: def add(x, y): +21: z = x + y +22: retrn z +23: +24: def multiply(x, y): +25: return x * y + +def subtract(x, y): + z = x - y +\`\`\` + +---old_hunk--- +\`\`\` + z = x / y + return z + +def add(x, y): + return x + y + +def subtract(x, y): + z = x - y +\`\`\` + +---comment_chains--- +\`\`\` +请审查此更改。 +\`\`\` + +---end_change_section--- + +### 示例响应 + +22-22: +add函数中有一个语法错误。 +\`\`\`diff +- retrn z ++ return z +\`\`\` +--- +24-25: +LGTM! +--- + +## 你要审查的\`$filename\`的更改 + +$patches + +## 审查结果 +` + + constructor() {} + + /** + * 文件差异摘要。 + * @param {Inputs} inputs - 输入对象。 + * @param {boolean} needReview - 是否需要审查。 + * @returns {string} 渲染后的字符串。 + */ + renderSummarizeFileDiff(inputs: Inputs, needReview: boolean): string { + let prompt = this.summarizeFileDiff + if (needReview) { + prompt += this.triageFileDiff + } + return inputs.render(prompt) + } + + /** + * 摘要。 + * @param {Inputs} inputs - 输入对象。 + * @returns {string} 渲染后的字符串。 + */ + renderSummarize(inputs: Inputs): string { + const prompt = this.summarizePrefix + this.summarize + return inputs.render(prompt) + } + + /** + * 文件差异审查。 + * @param {Inputs} inputs - 输入对象。 + * @returns {string} 渲染后的字符串。 + */ + renderReviewFileDiff(inputs: Inputs): string { + return inputs.render(this.reviewFileDiff) + } +} diff --git a/index.ts b/index.ts index cd6ee79..679e2ac 100644 --- a/index.ts +++ b/index.ts @@ -1,3 +1,6 @@ +import { v4 as uuid } from "uuid" + +import loggerIns from "./log" import { manageCIMonitorReq } from "./routes/ci" import { manageGitlabEventReq } from "./routes/event" import initSchedule from "./schedule" @@ -12,14 +15,16 @@ const PREFIX = "/gitlab_monitor" const server = Bun.serve({ async fetch(req) { try { + // 添加请求ID + const logger = loggerIns.child({ requestId: uuid() }) // 路由处理 const { exactCheck, fullCheck } = makeCheckPathTool(req.url, PREFIX) // 非根路由打印 - if (!fullCheck("/")) console.log("🚀 ~ serve ~ req.url", req.url) + if (!fullCheck("/")) logger.info(`${req.method} ${req.url}`) // CI 监控 if (exactCheck("/ci")) return manageCIMonitorReq(req) // Gitlab 事件 - if (exactCheck("/event")) return manageGitlabEventReq(req) + if (exactCheck("/event")) return manageGitlabEventReq(req, logger) // 其他 return netTool.ok("hello, there is gitlab monitor, glade to serve you!") } catch (error: any) { @@ -31,4 +36,4 @@ const server = Bun.serve({ port: 3000, }) -console.log(`Listening on ${server.hostname}:${server.port}`) +loggerIns.info(`Listening on ${server.hostname}:${server.port}`) diff --git a/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json b/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json new file mode 100644 index 0000000..2d79bc6 --- /dev/null +++ b/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json @@ -0,0 +1,15 @@ +{ + "keep": { + "days": true, + "amount": 14 + }, + "auditLog": "log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json", + "files": [ + { + "date": 1723259039565, + "name": "log/application-2024-08-10.log", + "hash": "fdd4f67d11fe79d1aedf242b8d2e1894fbd6a4679331098818c2324ec81678cd" + } + ], + "hashType": "sha256" +} \ No newline at end of file diff --git a/log/index.ts b/log/index.ts new file mode 100644 index 0000000..107b7b8 --- /dev/null +++ b/log/index.ts @@ -0,0 +1,38 @@ +import "winston-daily-rotate-file" + +import winston, { format } from "winston" + +const isProd = process.env.NODE_ENV === "production" + +const dailyRotateFileTransport = new winston.transports.DailyRotateFile({ + filename: "./log/application-%DATE%.log", + datePattern: "YYYY-MM-DD", + zippedArchive: true, + maxSize: "20m", + maxFiles: "14d", +}) + +const transports: any[] = [new winston.transports.Console()] +if (isProd) { + transports.push(dailyRotateFileTransport) +} + +const loggerIns = winston.createLogger({ + level: "info", + format: format.combine( + format.colorize({ + level: !isProd, + }), // 开发环境下输出彩色日志 + format.simple(), // 简单文本格式化 + format.timestamp({ format: "YYYY-MM-DD HH:mm:ss" }), + format.printf(({ level, message, timestamp, requestId }) => { + const singleLineMessage = isProd + ? message.replace(/\n/g, " ") // 将换行符替换为空格 + : message + return `${timestamp} [${level}] ${requestId ? `[RequestId: ${requestId}]` : ""}: ${singleLineMessage}` + }) + ), + transports, +}) + +export default loggerIns diff --git a/package.json b/package.json index b727c31..1765f21 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@commitlint/cli": "^19.3.0", "@commitlint/config-conventional": "^19.2.2", "@eslint/js": "^9.7.0", + "@gitbeaker/rest": "^40.1.2", "@types/lodash": "^4.14.202", "@types/node-schedule": "^2.1.6", "bun-types": "latest", @@ -35,10 +36,16 @@ "typescript": "^5.0.0" }, "dependencies": { + "@dqbd/tiktoken": "^1.0.15", + "@langchain/openai": "^0.2.6", "lodash": "^4.17.21", + "minimatch": "^10.0.1", "moment": "^2.30.1", "node-schedule": "^2.1.1", "p-limit": "^6.1.0", - "pocketbase": "^0.21.1" + "pocketbase": "^0.21.1", + "uuid": "^10.0.0", + "winston": "^3.14.1", + "winston-daily-rotate-file": "^5.0.0" } } \ No newline at end of file diff --git a/routes/event/index.ts b/routes/event/index.ts index 6344e05..d95e2c4 100644 --- a/routes/event/index.ts +++ b/routes/event/index.ts @@ -1,3 +1,6 @@ +import { Logger } from "winston" + +import manageMrEvent from "../../controllers/manageMrEvent" import managePipelineEvent from "../../controllers/managePipelineEvent" import netTool from "../../service/netTool" import { Gitlab } from "../../types/gitlab" @@ -7,15 +10,26 @@ import { Gitlab } from "../../types/gitlab" * @param {Request} req - 请求对象。 * @returns {Promise} - 响应对象。 */ -export const manageGitlabEventReq = async (req: Request): Promise => { +export const manageGitlabEventReq = async ( + req: Request, + logger: Logger +): Promise => { const apiKey = req.headers.get("x-gitlab-token") + logger.info(`x-gitlab-token: ${apiKey}`) if (!apiKey) return netTool.badRequest("x-gitlab-token is required!") const eventType = req.headers.get("x-gitlab-event") - // 只处理流水线钩子 + logger.info(`x-gitlab-event: ${eventType}`) + // 处理流水线钩子 if (eventType === "Pipeline Hook") { const body = (await req.json()) as Gitlab.PipelineEvent const params = new URLSearchParams(req.url.split("?")[1]) return managePipelineEvent.manageRawEvent(body, apiKey, params) } + // 处理MR钩子 + if (eventType === "Merge Request Hook") { + const body = (await req.json()) as Gitlab.MergeRequestEvent + logger.debug(`body: ${JSON.stringify(body)}`) + return manageMrEvent.manageRawEvent(body, logger) + } return netTool.ok() } diff --git a/script/mr/changes.json b/script/mr/changes.json new file mode 100644 index 0000000..a79136f --- /dev/null +++ b/script/mr/changes.json @@ -0,0 +1,1388 @@ +{ + "id": 2353231, + "iid": 484, + "project_id": 139032, + "title": "eslint: 代码格式化", + "description": "@jiangtong @wujiali5", + "state": "merged", + "created_at": "2024-08-09T11:35:35.066+08:00", + "updated_at": "2024-08-09T15:40:53.840+08:00", + "merged_by": { + "id": 18608, + "username": "jiangtong", + "name": "姜通", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/18608/avatar.png", + "web_url": "https://git.n.xiaomi.com/jiangtong" + }, + "merged_at": "2024-08-09T15:40:53.860+08:00", + "closed_by": null, + "closed_at": null, + "target_branch": "preview", + "source_branch": "feat/wt-lint", + "user_notes_count": 0, + "upvotes": 0, + "downvotes": 0, + "author": { + "id": 30382, + "username": "wuting7", + "name": "吴婷", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/30382/avatar.png", + "web_url": "https://git.n.xiaomi.com/wuting7" + }, + "assignees": [], + "assignee": null, + "reviewers": [], + "source_project_id": 139032, + "target_project_id": 139032, + "labels": [], + "draft": false, + "work_in_progress": false, + "milestone": null, + "merge_when_pipeline_succeeds": false, + "merge_status": "can_be_merged", + "sha": "f73a20e843d8cd35caa83f05e6187a9f9c6fd95d", + "merge_commit_sha": "a270a2e160683cad99ce2d769b314ddca9af6e58", + "squash_commit_sha": null, + "discussion_locked": null, + "should_remove_source_branch": null, + "force_remove_source_branch": true, + "reference": "!484", + "references": { + "short": "!484", + "relative": "!484", + "full": "cloudml-visuals/fe/cloud-ml-fe!484" + }, + "web_url": "https://git.n.xiaomi.com/cloudml-visuals/fe/cloud-ml-fe/-/merge_requests/484", + "time_stats": { + "time_estimate": 0, + "total_time_spent": 0, + "human_time_estimate": null, + "human_total_time_spent": null + }, + "squash": false, + "task_completion_status": { + "count": 0, + "completed_count": 0 + }, + "has_conflicts": false, + "blocking_discussions_resolved": true, + "subscribed": false, + "changes_count": "125", + "latest_build_started_at": "2024-08-09T15:35:12.623+08:00", + "latest_build_finished_at": "2024-08-09T15:37:31.604+08:00", + "first_deployed_to_production_at": null, + "pipeline": { + "id": 8949606, + "project_id": 139032, + "sha": "f73a20e843d8cd35caa83f05e6187a9f9c6fd95d", + "ref": "refs/merge-requests/484/head", + "status": "success", + "source": "merge_request_event", + "created_at": "2024-08-09T15:34:50.429+08:00", + "updated_at": "2024-08-09T15:37:31.611+08:00", + "web_url": "https://git.n.xiaomi.com/cloudml-visuals/fe/cloud-ml-fe/-/pipelines/8949606" + }, + "head_pipeline": { + "id": 8949606, + "project_id": 139032, + "sha": "f73a20e843d8cd35caa83f05e6187a9f9c6fd95d", + "ref": "refs/merge-requests/484/head", + "status": "success", + "source": "merge_request_event", + "created_at": "2024-08-09T15:34:50.429+08:00", + "updated_at": "2024-08-09T15:37:31.611+08:00", + "web_url": "https://git.n.xiaomi.com/cloudml-visuals/fe/cloud-ml-fe/-/pipelines/8949606", + "before_sha": "0000000000000000000000000000000000000000", + "tag": false, + "yaml_errors": null, + "user": { + "id": 30382, + "username": "wuting7", + "name": "吴婷", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/30382/avatar.png", + "web_url": "https://git.n.xiaomi.com/wuting7" + }, + "started_at": "2024-08-09T15:35:12.623+08:00", + "finished_at": "2024-08-09T15:37:31.604+08:00", + "committed_at": null, + "duration": 139, + "queued_duration": 22, + "coverage": null, + "detailed_status": { + "icon": "status_success", + "text": "passed", + "label": "passed", + "group": "success", + "tooltip": "passed", + "has_details": true, + "details_path": "/cloudml-visuals/fe/cloud-ml-fe/-/pipelines/8949606", + "illustration": null, + "favicon": "/assets/ci_favicons/favicon_status_success-8451333011eee8ce9f2ab25dc487fe24a8758c694827a582f17f42b0a90446a2.png" + } + }, + "diff_refs": { + "base_sha": "cb3989df09db0e74fd14838c078fe30558673b51", + "head_sha": "f73a20e843d8cd35caa83f05e6187a9f9c6fd95d", + "start_sha": "cb3989df09db0e74fd14838c078fe30558673b51" + }, + "merge_error": null, + "user": { + "can_merge": true + }, + "changes": [ + { + "old_path": "src/pages/DataSet/DataList/components/Header/index.tsx", + "new_path": "src/pages/DataSet/DataList/components/Header/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -3,6 +3,7 @@ import { history } from '@umijs/max';\n import { Affix, Button, Typography } from 'antd';\n import classnames from 'classnames';\n import React, { memo, useCallback } from 'react';\n+\n import style from './index.less';\n function Header({\n showBack = true,\n" + }, + { + "old_path": "src/pages/DataSet/DataList/components/CreateModal.tsx", + "new_path": "src/pages/DataSet/DataList/components/CreateModal.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,10 @@\n /* eslint-disable no-unused-expressions */\n /* eslint-disable react/require-default-props */\n+import { QuestionCircleOutlined } from '@ant-design/icons';\n+import { useModel } from '@umijs/max';\n+import { Button, Form, Input, message, Radio, Select, Space, Spin, Tooltip } from 'antd';\n+import { useEffect, useState } from 'react';\n+\n import Drawer from '@/components/Drawer';\n import {\n data_property,\n@@ -11,10 +16,6 @@ import {\n StarFS,\n } from '@/pages/AssetManagement/Storage/constants';\n import { queryCreateDataSource, queryCreateNas, queryCreateStarfs } from '@/services/storage';\n-import { QuestionCircleOutlined } from '@ant-design/icons';\n-import { useModel } from '@umijs/max';\n-import { Button, Form, Input, message, Radio, Select, Space, Spin, Tooltip } from 'antd';\n-import { useEffect, useState } from 'react';\n export default ({\n storages,\n open,\n" + }, + { + "old_path": "src/pages/DataSet/DataList/hooks/useSecret.ts", + "new_path": "src/pages/DataSet/DataList/hooks/useSecret.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n-import { queryStarfsList } from '@/services/storage';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import { queryStarfsList } from '@/services/storage';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [secret, setSecret] = useState([]);\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Create/CreateFds.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Create/CreateFds.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,11 @@\n+import { history, useModel } from '@umijs/max';\n+import { Form, Input, message,Radio, Select } from 'antd';\n+import { useEffect } from 'react';\n+\n import reminder from '@/components/reminder';\n import { fdsOptions } from '@/pages/DataSet/DataList/constants';\n import { validDataSetName } from '@/pages/DataSet/DataList/constants/utils';\n import { queryCreateDataSet } from '@/services/dataList';\n-import { history, useModel } from '@umijs/max';\n-import { Form, Input, Radio, Select, message } from 'antd';\n-import { useEffect } from 'react';\n const CreateFds = ({ onRef }: { onRef: (o: {}) => void }) => {\n const { TextArea } = Input;\n const [form] = Form.useForm();\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Create/CreateLocal.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Create/CreateLocal.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,12 @@\n /* eslint-disable no-param-reassign */\n+import { history, useModel } from '@umijs/max';\n+import { Button, Form, Input, message, notification,Radio, Select, Upload } from 'antd';\n+import { useEffect } from 'react';\n+\n import reminder from '@/components/reminder';\n import { layout } from '@/pages/DataSet/DataList/constants';\n import { validDataSetName } from '@/pages/DataSet/DataList/constants/utils';\n import { queryCreateDataSet, queryUploadDataSet } from '@/services/dataList';\n-import { history, useModel } from '@umijs/max';\n-import { Button, Form, Input, Radio, Select, Upload, message, notification } from 'antd';\n-import { useEffect } from 'react';\n const CreateLocal = ({\n onRef,\n formItemLayout = layout,\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Create/CreateNas.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Create/CreateNas.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,11 @@\n+import { history, useModel } from '@umijs/max';\n+import { Form, Input, message,Radio, Select } from 'antd';\n+import { useEffect, useState } from 'react';\n+\n import reminder from '@/components/reminder';\n import { validDataSetName, validPathStart } from '@/pages/DataSet/DataList/constants/utils';\n import { queryCreateDataSet } from '@/services/dataList';\n import { queryNasList } from '@/services/storage';\n-import { history, useModel } from '@umijs/max';\n-import { Form, Input, Radio, Select, message } from 'antd';\n-import { useEffect, useState } from 'react';\n const CreateNas = ({ onRef }: { onRef: (o: {}) => void }) => {\n const { TextArea } = Input;\n const [secretOptions, setSecretOptions] = useState([]);\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Create/CreateStarFS.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Create/CreateStarFS.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,12 +1,14 @@\n+import { history, useModel } from '@umijs/max';\n+import { Button, Form, Input, message, Radio, Select } from 'antd';\n+import { useEffect, useState } from 'react';\n+\n import reminder from '@/components/reminder';\n import CreateModal from '@/pages/AssetManagement/Storage/components/CreateModal';\n import { StarFSLabel } from '@/pages/AssetManagement/Storage/constants';\n import { StarFS } from '@/pages/DataSet/DataList/constants';\n import useSecret from '@/pages/DataSet/DataList/hooks/useSecret';\n import { queryCreateDataSet } from '@/services/dataList';\n-import { history, useModel } from '@umijs/max';\n-import { Button, Form, Input, message, Radio, Select } from 'antd';\n-import { useEffect, useState } from 'react';\n+\n import { validDataSetName, validPathStart } from '../../constants/utils';\n \n const CreateStarFS = ({ onRef }: { onRef: (o: {}) => void }) => {\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Create/index.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,8 @@\n+import { history } from '@umijs/max';\n+import { Button, Card, Space, Spin, Tabs } from 'antd';\n+import classnames from 'classnames';\n+import React, { useMemo, useRef, useState } from 'react';\n+\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import useTrack from '@/hooks/useTrack';\n import useCreateTabs from '@/pages/DataSet/DataList/hooks/useCreateTabs';\n@@ -5,10 +10,7 @@ import CreateFds from '@/pages/DataSet/DataList/pages/Create/CreateFds';\n import CreateLocal from '@/pages/DataSet/DataList/pages/Create/CreateLocal';\n import CreateNas from '@/pages/DataSet/DataList/pages/Create/CreateNas';\n import CreateStarFS from '@/pages/DataSet/DataList/pages/Create/CreateStarFS';\n-import { history } from '@umijs/max';\n-import { Button, Card, Space, Spin, Tabs } from 'antd';\n-import classnames from 'classnames';\n-import React, { useMemo, useRef, useState } from 'react';\n+\n import styles from '../../assets/styles/index.less';\n import { TrackEnum } from '../../constants/track';\n \n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Manage/create/index.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Manage/create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n-import reminder from '@/components/reminder';\n-import { queryChangeAccess, queryCreateAccess } from '@/services/dataList';\n import { useModel } from '@umijs/max';\n import { Form, Input, message, Modal, Select } from 'antd';\n import { cloneDeep } from 'lodash';\n import { useEffect, useState } from 'react';\n+\n+import reminder from '@/components/reminder';\n+import { queryChangeAccess, queryCreateAccess } from '@/services/dataList';\n+\n import { accessFilter, personAccessOptions, teamAccessOptions } from '../../../constants';\n const CreateAccess = ({\n open,\n" + }, + { + "old_path": "src/pages/DataSet/DataList/pages/Manage/index.tsx", + "new_path": "src/pages/DataSet/DataList/pages/Manage/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,4 @@\n /* eslint-disable prefer-destructuring */\n-import ContentLayout from '@/components/ContentLayout';\n-import reminder from '@/components/reminder';\n-import styles from '@/pages/DataSet/DataList/assets/styles/index.less';\n-import { queryAccessList, queryDataList, queryDeleteAccess } from '@/services/dataList';\n import { useLocation, useModel } from '@umijs/max';\n import { useAntdTable } from 'ahooks';\n import {\n@@ -24,6 +20,12 @@ import { ColumnsType } from 'antd/es/table';\n import classnames from 'classnames';\n import dayjs from 'dayjs';\n import { useEffect, useRef, useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import reminder from '@/components/reminder';\n+import styles from '@/pages/DataSet/DataList/assets/styles/index.less';\n+import { queryAccessList, queryDataList, queryDeleteAccess } from '@/services/dataList';\n+\n import CreateAccess from './create';\n \n const AccessManage = () => {\n" + }, + { + "old_path": "src/pages/DataSet/DataList/index.tsx", + "new_path": "src/pages/DataSet/DataList/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,3 @@\n-import ContentLayout from '@/components/ContentLayout';\n-import reminder from '@/components/reminder';\n-import useTrack from '@/hooks/useTrack';\n-import styles from '@/pages/DataSet/DataList/assets/styles/index.less';\n-import ExpandDetail from '@/pages/DataSet/DataList/components/ExpandDetail';\n-import { createTypeFilter, statusList } from '@/pages/DataSet/DataList/constants';\n-import { queryDataList, queryDeleteDataList } from '@/services/dataList';\n import { ReloadOutlined } from '@ant-design/icons';\n import { history, useModel } from '@umijs/max';\n import { useAntdTable } from 'ahooks';\n@@ -15,19 +8,28 @@ import {\n Checkbox,\n Form,\n Input,\n+ message,\n PaginationProps,\n Popconfirm,\n Space,\n Table,\n Tooltip,\n Typography,\n- message,\n } from 'antd';\n import { PresetStatusColorType } from 'antd/es/_util/colors';\n import { ColumnsType } from 'antd/es/table';\n import classnames from 'classnames';\n import dayjs from 'dayjs';\n import { useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import reminder from '@/components/reminder';\n+import useTrack from '@/hooks/useTrack';\n+import styles from '@/pages/DataSet/DataList/assets/styles/index.less';\n+import ExpandDetail from '@/pages/DataSet/DataList/components/ExpandDetail';\n+import { createTypeFilter, statusList } from '@/pages/DataSet/DataList/constants';\n+import { queryDataList, queryDeleteDataList } from '@/services/dataList';\n+\n import { TrackEnum } from './constants/track';\n \n export default () => {\n" + }, + { + "old_path": "src/pages/Develop/Config/components/CreateInfoForm/Resource/index.tsx", + "new_path": "src/pages/Develop/Config/components/CreateInfoForm/Resource/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,9 @@\n+import { Form } from 'antd';\n+import { memo, useMemo } from 'react';\n+\n import SingleNode from '@/components/ResourceInstance/SingleNode';\n import useTeamResource from '@/hooks/useTeamResource';\n import type { ResourceInstanceList } from '@/types/global';\n-import { Form } from 'antd';\n-import { memo, useMemo } from 'react';\n \n export default memo(\n ({\n" + }, + { + "old_path": "src/pages/Develop/Config/components/CreateInfoForm/index.tsx", + "new_path": "src/pages/Develop/Config/components/CreateInfoForm/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,21 +1,3 @@\n-import { isResourceInstance } from '@/cluster';\n-import SelectDataset from '@/components/SelectDataset';\n-import useInitialState from '@/hooks/useInitialState';\n-import useLink from '@/hooks/useLink';\n-import { NAS, StarFS } from '@/pages/AssetManagement/Storage/constants';\n-import { isNoPrivate } from '@/pages/Develop/cluster';\n-import { getStorageMount } from '@/pages/Develop/Config/util';\n-import { Gi } from '@/pages/ModelService/constants';\n-import { Option } from '@/pages/Tensorboard/typings';\n-import {\n- queryCreateDebugDev,\n- queryCreateDevService,\n- queryDevDetail,\n- queryEditDevService,\n-} from '@/services/develop';\n-import { querySecretImages } from '@/services/tensorboard';\n-import { isJSONString } from '@/utils/utils';\n-import { validPathStart } from '@/utils/validate';\n import { QuestionCircleOutlined } from '@ant-design/icons';\n import { useParams } from '@umijs/max';\n import {\n@@ -34,6 +16,26 @@ import {\n } from 'antd';\n import _ from 'lodash';\n import { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react';\n+\n+import { isResourceInstance } from '@/cluster';\n+import SelectDataset from '@/components/SelectDataset';\n+import useInitialState from '@/hooks/useInitialState';\n+import useLink from '@/hooks/useLink';\n+import { NAS, StarFS } from '@/pages/AssetManagement/Storage/constants';\n+import { isNoPrivate } from '@/pages/Develop/cluster';\n+import { getStorageMount } from '@/pages/Develop/Config/util';\n+import { Gi } from '@/pages/ModelService/constants';\n+import { Option } from '@/pages/Tensorboard/typings';\n+import {\n+ queryCreateDebugDev,\n+ queryCreateDevService,\n+ queryDevDetail,\n+ queryEditDevService,\n+} from '@/services/develop';\n+import { querySecretImages } from '@/services/tensorboard';\n+import { isJSONString } from '@/utils/utils';\n+import { validPathStart } from '@/utils/validate';\n+\n import {\n c5,\n c5Preview,\n" + }, + { + "old_path": "src/pages/Develop/Config/components/EventList/index.tsx", + "new_path": "src/pages/Develop/Config/components/EventList/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import EventInfo, { EventType } from '@/components/EventInfo';\n-import { queryDevEvent } from '@/services/develop';\n import { useModel, useParams } from '@umijs/max';\n import { useCallback, useEffect, useState } from 'react';\n+\n+import EventInfo, { EventType } from '@/components/EventInfo';\n+import { queryDevEvent } from '@/services/develop';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const {\n" + }, + { + "old_path": "src/pages/Develop/Config/components/LoginModal/index.tsx", + "new_path": "src/pages/Develop/Config/components/LoginModal/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,9 @@\n-import { queryDevDetail } from '@/services/develop';\n import { useModel } from '@umijs/max';\n import { Alert, Button, Divider, Modal, Space, Spin, Typography } from 'antd';\n import { useEffect, useState } from 'react';\n+\n+import { queryDevDetail } from '@/services/develop';\n+\n import styles from '../../assets/styles/index.less';\n export default ({\n item,\n" + }, + { + "old_path": "src/pages/Develop/Config/components/Logs/index.tsx", + "new_path": "src/pages/Develop/Config/components/Logs/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,11 @@\n+import { useParams } from '@umijs/max';\n+import { useCallback } from 'react';\n+\n import Log from '@/components/LogInfo/Log';\n import { LOGS_LINES } from '@/constants/global';\n import useInitialState from '@/hooks/useInitialState';\n import { queryDevlLog } from '@/services/develop';\n import downloadFile from '@/utils/downloadFile';\n-import { useParams } from '@umijs/max';\n-import { useCallback } from 'react';\n export default () => {\n const {\n dev_name,\n" + }, + { + "old_path": "src/pages/Develop/Config/components/SaveEnvModal/index.tsx", + "new_path": "src/pages/Develop/Config/components/SaveEnvModal/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n /* eslint-disable react/react-in-jsx-scope */\n-import { querySaveEnvService } from '@/services/develop';\n import { useModel } from '@umijs/max';\n import { Form, Input, message, Modal } from 'antd';\n import { useEffect } from 'react';\n+\n+import { querySaveEnvService } from '@/services/develop';\n+\n import { ICreateHeder } from '../../typings';\n export default ({\n visible,\n" + }, + { + "old_path": "src/pages/Develop/Config/components/StorageMode/index.tsx", + "new_path": "src/pages/Develop/Config/components/StorageMode/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,13 @@\n import { QuestionCircleOutlined } from '@ant-design/icons';\n+import { useModel } from '@umijs/max';\n import { Button, Form, Input, Select, Space, Tooltip } from 'antd';\n import { useEffect, useMemo, useState } from 'react';\n+\n // @ts-ignore\n import { FDS, NAS, PAI, StarFS } from '@/pages/AssetManagement/Storage/constants';\n import { queryTaskList } from '@/services/paidlc';\n import { queryFdsList, queryNasList, queryStarfsList } from '@/services/storage';\n-import { useModel } from '@umijs/max';\n+\n import CreateModal from '../../../../AssetManagement/Storage/components/CreateModal';\n import styles from '../../assets/styles/index.less';\n import useStorageTypes from '../../hooks/useStorageTypes';\n" + }, + { + "old_path": "src/pages/Develop/Config/hooks/useDevActiveTab.ts", + "new_path": "src/pages/Develop/Config/hooks/useDevActiveTab.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,4 +1,5 @@\n import { useModel } from '@umijs/max';\n+\n import { c5, c5Preview, c5Staging, tj5 } from '../../../../../config/cluster';\n export default () => {\n const { initialState } = useModel('@@initialState');\n" + }, + { + "old_path": "src/pages/Develop/Config/hooks/useEnvImage.ts", + "new_path": "src/pages/Develop/Config/hooks/useEnvImage.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n+import { useEffect, useState } from 'react';\n+\n import useInitialState from '@/hooks/useInitialState';\n import { queryEnvList } from '@/services/develop';\n-import { useEffect, useState } from 'react';\n \n export default () => {\n const { cluster, teamId, userName } = useInitialState();\n" + }, + { + "old_path": "src/pages/Develop/Config/hooks/useGpus.ts", + "new_path": "src/pages/Develop/Config/hooks/useGpus.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n import { useModel } from '@umijs/max';\n import { useEffect, useMemo, useState } from 'react';\n+\n /* eslint-disable no-restricted-syntax */\n import { RESOURCE_CLUSTERS } from '@/cluster';\n import { resourceQuery } from '@/services/resource';\n import { queryRestQuota } from '@/services/space';\n+\n import {\n c5,\n c5Preview,\n" + }, + { + "old_path": "src/pages/Develop/Config/hooks/useImage.ts", + "new_path": "src/pages/Develop/Config/hooks/useImage.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n-import { queryImageList } from '@/services/develop';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import { queryImageList } from '@/services/develop';\n export default (activeKey: string) => {\n const { initialState } = useModel('@@initialState');\n const [images, setImages] = useState([]);\n" + }, + { + "old_path": "src/pages/Develop/Config/hooks/useStorageTypes.ts", + "new_path": "src/pages/Develop/Config/hooks/useStorageTypes.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,8 @@\n-import { RESOURCE_CLUSTERS } from '@/cluster';\n import { useModel } from '@umijs/max';\n import { useMemo } from 'react';\n+\n+import { RESOURCE_CLUSTERS } from '@/cluster';\n+\n import {\n c5,\n c5Preview,\n" + }, + { + "old_path": "src/pages/Develop/Config/pages/Create.tsx", + "new_path": "src/pages/Develop/Config/pages/Create.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,12 +1,14 @@\n+import { history, useModel } from '@umijs/max';\n+import { useAsyncEffect } from 'ahooks';\n+import { Button, Space, Tabs } from 'antd';\n+import { useEffect, useMemo, useRef, useState } from 'react';\n+\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import useLink from '@/hooks/useLink';\n import useTrack from '@/hooks/useTrack';\n import useDevActiveTab from '@/pages/Develop/Config/hooks/useDevActiveTab';\n import { queryTrainWhiteList } from '@/services/develop';\n-import { history, useModel } from '@umijs/max';\n-import { useAsyncEffect } from 'ahooks';\n-import { Button, Space, Tabs } from 'antd';\n-import { useEffect, useMemo, useRef, useState } from 'react';\n+\n import { TrackEnum } from '../../track';\n import CreateInfoForm from '../components/CreateInfoForm';\n import { createTabs, enableDevObj } from '../constants';\n" + }, + { + "old_path": "src/pages/Develop/Config/pages/Detail.tsx", + "new_path": "src/pages/Develop/Config/pages/Detail.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,8 @@\n+import { history, useModel, useParams } from '@umijs/max';\n+import { Button, Card, message, Modal, Popconfirm, Space, Spin, Tabs, Typography } from 'antd';\n+import _ from 'lodash';\n+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';\n+\n import { isResourceInstance } from '@/cluster';\n import Collapse from '@/components/Collapse';\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n@@ -7,10 +12,7 @@ import { INSTANCE_TYPE_MAP, RESOURCE_MONITORING_LINK } from '@/constants/global'\n import useLink from '@/hooks/useLink';\n import useTrack from '@/hooks/useTrack';\n import { queryDeleteDev, queryDevDetail, queryRestartDev, queryStopDev } from '@/services/develop';\n-import { history, useModel, useParams } from '@umijs/max';\n-import { Button, Card, message, Modal, Popconfirm, Space, Spin, Tabs, Typography } from 'antd';\n-import _ from 'lodash';\n-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';\n+\n import { TrackEnum } from '../../track';\n import EventList from '../components/EventList';\n import LoginModal from '../components/LoginModal';\n" + }, + { + "old_path": "src/pages/Develop/Config/index.tsx", + "new_path": "src/pages/Develop/Config/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,3 @@\n-import { IInitialState } from '@/app';\n-import TableTooltipItem from '@/components/TableTooltipItem';\n-import { pagination, RESOURCE_MONITORING_LINK } from '@/constants/global';\n-import useSearchStorage from '@/hooks/useSearchStorage';\n-import useTrack from '@/hooks/useTrack';\n-import { queryDeleteDev, queryDevList, queryRestartDev, queryStopDev } from '@/services/develop';\n-import { queryGroupImpl } from '@/services/global';\n import { EllipsisOutlined, ReloadOutlined } from '@ant-design/icons';\n import { history, useModel } from '@umijs/max';\n import { useAntdTable } from 'ahooks';\n@@ -23,6 +16,15 @@ import {\n Table,\n } from 'antd';\n import { useEffect, useRef, useState } from 'react';\n+\n+import { IInitialState } from '@/app';\n+import TableTooltipItem from '@/components/TableTooltipItem';\n+import { pagination, RESOURCE_MONITORING_LINK } from '@/constants/global';\n+import useSearchStorage from '@/hooks/useSearchStorage';\n+import useTrack from '@/hooks/useTrack';\n+import { queryDeleteDev, queryDevList, queryRestartDev, queryStopDev } from '@/services/develop';\n+import { queryGroupImpl } from '@/services/global';\n+\n import { TrackEnum } from '../track';\n import LoginModal from './components/LoginModal';\n import SaveEnvModal from './components/SaveEnvModal';\n" + }, + { + "old_path": "src/pages/Develop/Image/constants/index.tsx", + "new_path": "src/pages/Develop/Image/constants/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n /* eslint-disable react/react-in-jsx-scope */\n-import { getPopupContainer } from '@/utils/utils';\n import { InfoCircleOutlined } from '@ant-design/icons';\n import { Tooltip, Typography } from 'antd';\n import dayjs from 'dayjs';\n+\n+import { getPopupContainer } from '@/utils/utils';\n+\n import styles from '../../index.less';\n \n const { Paragraph } = Typography;\n" + }, + { + "old_path": "src/pages/Develop/Image/index.tsx", + "new_path": "src/pages/Develop/Image/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,13 @@\n-import TableTooltipItem from '@/components/TableTooltipItem';\n-import { pagination } from '@/constants/global';\n-import useTrack from '@/hooks/useTrack';\n-import { deleteEnv, queryEnvList } from '@/services/develop';\n import { ReloadOutlined } from '@ant-design/icons';\n import { history, useModel } from '@umijs/max';\n import { useAntdTable } from 'ahooks';\n import { Button, Card, Checkbox, Form, Input, message, Popconfirm, Table } from 'antd';\n+\n+import TableTooltipItem from '@/components/TableTooltipItem';\n+import { pagination } from '@/constants/global';\n+import useTrack from '@/hooks/useTrack';\n+import { deleteEnv, queryEnvList } from '@/services/develop';\n+\n import styles from '../index.less';\n import { TrackEnum } from '../track';\n import { columns } from './constants';\n" + }, + { + "old_path": "src/pages/Develop/index.tsx", + "new_path": "src/pages/Develop/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n+import { Button, Tabs } from 'antd';\n+import { useCallback, useMemo, useState } from 'react';\n+\n import { isResourceInstance } from '@/cluster';\n import ContentLayout from '@/components/ContentLayout';\n import useInitialState from '@/hooks/useInitialState';\n import useTrack from '@/hooks/useTrack';\n-import { Button, Tabs } from 'antd';\n-import { useCallback, useMemo, useState } from 'react';\n+\n import Config from './Config';\n import Image from './Image';\n import styles from './index.less';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/components/Actions/index.tsx", + "new_path": "src/pages/KnowledgeBase/components/Actions/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,13 @@\n-import reminder from '@/components/reminder';\n-import useInitialState from '@/hooks/useInitialState';\n-import useTrack from '@/hooks/useTrack';\n import { history } from '@umijs/max';\n-import { Button, Popconfirm, Space, message } from 'antd';\n+import { Button, message,Popconfirm, Space } from 'antd';\n import { SpaceSize } from 'antd/es/space';\n import { ButtonSize, ButtonType } from 'antd/lib/button';\n import { memo, useCallback } from 'react';\n+\n+import reminder from '@/components/reminder';\n+import useInitialState from '@/hooks/useInitialState';\n+import useTrack from '@/hooks/useTrack';\n+\n import { deleteKnowledgeBase } from '../../service';\n import { TrackEnum } from '../../track';\n import style from './index.less';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/components/Card/index.tsx", + "new_path": "src/pages/KnowledgeBase/components/Card/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n import { Card } from 'antd';\n import { CardProps } from 'antd/lib/card';\n import React, { memo } from 'react';\n+\n import style from './index.module.less';\n \n function CardCom({\n" + }, + { + "old_path": "src/pages/KnowledgeBase/components/Header/index.tsx", + "new_path": "src/pages/KnowledgeBase/components/Header/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -3,6 +3,7 @@ import { history } from '@umijs/max';\n import { Affix, Button, Typography } from 'antd';\n import classnames from 'classnames';\n import React, { memo, useCallback } from 'react';\n+\n import style from './index.module.less';\n function Header({\n showBack = true,\n" + }, + { + "old_path": "src/pages/KnowledgeBase/hooks/usePlayground.ts", + "new_path": "src/pages/KnowledgeBase/hooks/usePlayground.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,9 @@\n-import useInitialState from '@/hooks/useInitialState';\n-import { ragQueryTrack } from '@/utils/track';\n import { useParams } from '@umijs/max';\n import { useCallback, useState } from 'react';\n+\n+import useInitialState from '@/hooks/useInitialState';\n+import { ragQueryTrack } from '@/utils/track';\n+\n import { LANGUAGE_MODEL, LANGUAGE_MODEL_PROMPT } from '../constant';\n import { getAnswer } from '../service';\n import { getRandomNum } from '../utils';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Create/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n /* eslint-disable consistent-return */\n-import useInitialState from '@/hooks/useInitialState';\n import { Form, Input, Select } from 'antd';\n import _ from 'lodash';\n import { forwardRef, memo, useCallback, useImperativeHandle } from 'react';\n+\n+import useInitialState from '@/hooks/useInitialState';\n+\n import { KNOWLEDGE_SOURCE } from '../../constant';\n import { createKnowledgeBase } from '../../service';\n \n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Detail/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,12 +1,14 @@\n+import { history, useParams } from '@umijs/max';\n+import { Button, Divider, Input, message,Popconfirm, Space, Spin, Table, Typography } from 'antd';\n+import dayjs from 'dayjs';\n+import { memo, useCallback, useMemo, useState } from 'react';\n+\n import ContentLayout from '@/components/ContentLayout';\n import Info, { DATA_TYPE, INFO_TYPE } from '@/components/Info';\n import reminder from '@/components/reminder';\n import useInitialState from '@/hooks/useInitialState';\n import useRequestData from '@/hooks/useRequestData';\n-import { history, useParams } from '@umijs/max';\n-import { Button, Divider, Input, Popconfirm, Space, Spin, Table, Typography, message } from 'antd';\n-import dayjs from 'dayjs';\n-import { memo, useCallback, useMemo, useState } from 'react';\n+\n import Actions from '../../components/Actions';\n import { DOC_TYPE, STATUS, UPLOAD_TYPE } from '../../constant';\n import {\n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Playground/SendInput/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Playground/SendInput/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n /* eslint-disable consistent-return */\n import { Input } from 'antd';\n import { useEffect, useRef, useState } from 'react';\n+\n import sendIcon from '../../../assets/sendIcon.png';\n import styles from './index.less';\n \n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Playground/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Playground/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,4 @@\n /* eslint-disable react/no-children-prop */\n-import ContentLayout from '@/components/ContentLayout';\n import { useParams } from '@umijs/max';\n import { Button, Select, Space, Spin } from 'antd';\n import classnames from 'classnames';\n@@ -8,6 +7,9 @@ import ReactJsonView from 'react-json-view';\n import Markdown from 'react-markdown';\n import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';\n import remarkGrm from 'remark-gfm';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+\n import miIcon from '../../assets/miIcon.png';\n import userIcon from '../../assets/userIcon.png';\n import { LANGUAGE_MODEL } from '../../constant';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Upload/FeishuFile/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Upload/FeishuFile/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -2,6 +2,7 @@\n import { QuestionCircleOutlined } from '@ant-design/icons';\n import { Alert, Button, Form, Input, Table, Tooltip } from 'antd';\n import { memo } from 'react';\n+\n import img from '../../../assets/image.png';\n \n const FeishuFile = ({ urls = [] }: { urls: any[] }) => {\n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Upload/LocalUpload/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Upload/LocalUpload/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n /* eslint-disable prefer-promise-reject-errors */\n-import reminder from '@/components/reminder';\n import { InboxOutlined } from '@ant-design/icons';\n import { Form, Radio, Upload } from 'antd';\n import { UploadProps } from 'antd/es/upload';\n import _ from 'lodash';\n import { memo, useMemo } from 'react';\n+\n+import reminder from '@/components/reminder';\n+\n import { ACCEPT_FILE_TYPE, LOCAL_UPLOAD_LISTS, LOCAL_UPLOAD_TYPE } from '../../../constant';\n \n const { Dragger } = Upload;\n" + }, + { + "old_path": "src/pages/KnowledgeBase/pages/Upload/index.tsx", + "new_path": "src/pages/KnowledgeBase/pages/Upload/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n-import ContentLayout from '@/components/ContentLayout';\n-import reminder from '@/components/reminder';\n-import useInitialState from '@/hooks/useInitialState';\n import { history, useParams } from '@umijs/max';\n import { Alert, Button, Form, message, notification, Radio, Space, Spin, Typography } from 'antd';\n import { memo, useCallback, useMemo, useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import reminder from '@/components/reminder';\n+import useInitialState from '@/hooks/useInitialState';\n+\n import { UPLOAD_LISTS, UPLOAD_TYPE } from '../../constant';\n import useCnName from '../../hooks/useCnName';\n import { uploadFile } from '../../service';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/index.tsx", + "new_path": "src/pages/KnowledgeBase/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,15 +1,17 @@\n-import ContentLayout from '@/components/ContentLayout';\n-import Drawer from '@/components/Drawer';\n-import reminder from '@/components/reminder';\n-import useInitialState from '@/hooks/useInitialState';\n-import useRequestData from '@/hooks/useRequestData';\n-import useTrack from '@/hooks/useTrack';\n import { ReloadOutlined } from '@ant-design/icons';\n import { history } from '@umijs/max';\n import { Button, Input, message, Space, Spin, Switch, Table, Typography } from 'antd';\n import dayjs from 'dayjs';\n import _ from 'lodash';\n import { useCallback, useMemo, useRef, useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import Drawer from '@/components/Drawer';\n+import reminder from '@/components/reminder';\n+import useInitialState from '@/hooks/useInitialState';\n+import useRequestData from '@/hooks/useRequestData';\n+import useTrack from '@/hooks/useTrack';\n+\n import Actions from './components/Actions';\n import { KNOWLEDGE_SOURCE } from './constant';\n import style from './index.less';\n" + }, + { + "old_path": "src/pages/KnowledgeBase/utils.ts", + "new_path": "src/pages/KnowledgeBase/utils.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n /* eslint-disable no-restricted-properties */\n // 上传文档数据处理\n import _ from 'lodash';\n+\n import { UPLOAD_TYPE } from './constant';\n \n const getFileName = (fileName = '') => {\n" + }, + { + "old_path": "src/pages/ModelSquare/components/ApiInfo/index.tsx", + "new_path": "src/pages/ModelSquare/components/ApiInfo/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,6 @@\n import { Card, Typography } from 'antd';\n import React from 'react';\n+\n import CodeMirror from '../CodeMirror';\n import styles from './index.less';\n \n" + }, + { + "old_path": "src/pages/ModelSquare/components/CodeMirror/index.tsx", + "new_path": "src/pages/ModelSquare/components/CodeMirror/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,15 +1,17 @@\n-import { CopyOutlined } from '@ant-design/icons';\n-import { useFullscreen } from 'ahooks';\n-import { Space, Typography } from 'antd';\n-import classnames from 'classnames';\n import 'codemirror/addon/edit/closebrackets';\n import 'codemirror/lib/codemirror.css';\n import 'codemirror/mode/javascript/javascript.js';\n import 'codemirror/mode/shell/shell';\n import 'codemirror/mode/yaml/yaml';\n import 'codemirror/theme/base16-light.css';\n+\n+import { CopyOutlined } from '@ant-design/icons';\n+import { useFullscreen } from 'ahooks';\n+import { Space, Typography } from 'antd';\n+import classnames from 'classnames';\n import { CSSProperties, useRef } from 'react';\n import { Controlled as CodeMirror } from 'react-codemirror2';\n+\n import styles from './styles/index.less';\n \n const { Paragraph } = Typography;\n" + }, + { + "old_path": "src/pages/ModelSquare/components/ModelIntro/index.tsx", + "new_path": "src/pages/ModelSquare/components/ModelIntro/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n import { Button, Space, Tag, Typography } from 'antd';\n import classnames from 'classnames';\n import { memo } from 'react';\n+\n import ChatGLM from '../../assets/ChatGLM.png';\n import inner from '../../assets/inner.png';\n import Llama from '../../assets/Llama.png';\n" + }, + { + "old_path": "src/pages/ModelSquare/pages/Detail/ModelInfo/index.tsx", + "new_path": "src/pages/ModelSquare/pages/Detail/ModelInfo/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n import { InfoCircleOutlined } from '@ant-design/icons';\n import { Space, Typography } from 'antd';\n import { memo } from 'react';\n+\n import styles from './index.less';\n \n type Props = {\n" + }, + { + "old_path": "src/pages/ModelSquare/pages/Detail/ModelList/index.tsx", + "new_path": "src/pages/ModelSquare/pages/Detail/ModelList/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n-import useInitialState from '@/hooks/useInitialState';\n-import useTrack from '@/hooks/useTrack';\n-import { TrackEnum } from '@/pages/ModelSquare/constants/track';\n import { CloseOutlined } from '@ant-design/icons';\n import { history } from '@umijs/max';\n import { Button, Space, Table, Tooltip, Typography } from 'antd';\n import { memo, useCallback, useMemo, useState } from 'react';\n+\n+import useInitialState from '@/hooks/useInitialState';\n+import useTrack from '@/hooks/useTrack';\n+import { TrackEnum } from '@/pages/ModelSquare/constants/track';\n+\n import ApiInfo from '../../../components/ApiInfo';\n type Props = {\n data: {\n" + }, + { + "old_path": "src/pages/ModelSquare/pages/Detail/OpenModelInfo/index.tsx", + "new_path": "src/pages/ModelSquare/pages/Detail/OpenModelInfo/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,6 @@\n import { Space, Typography } from 'antd';\n import { memo } from 'react';\n+\n import styles from './index.less';\n \n type Props = {\n" + }, + { + "old_path": "src/pages/ModelSquare/pages/Detail/index.tsx", + "new_path": "src/pages/ModelSquare/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,9 @@\n-import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import { useParams } from '@umijs/max';\n import { Button, Card, Divider, Space, Tabs, Tag } from 'antd';\n import { useMemo, useState } from 'react';\n+\n+import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n+\n import { MODEL_ITEMS, MODEL_ITEMS_MAP } from '../../constant';\n import style from './index.less';\n import ModelInfo from './ModelInfo';\n" + }, + { + "old_path": "src/pages/ModelSquare/index.tsx", + "new_path": "src/pages/ModelSquare/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n-import ContentLayout from '@/components/ContentLayout';\n-import useInitialState from '@/hooks/useInitialState';\n-import useTrack from '@/hooks/useTrack';\n import { history } from '@umijs/max';\n import { Empty, Input, Space } from 'antd';\n import { useCallback, useMemo, useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import useInitialState from '@/hooks/useInitialState';\n+import useTrack from '@/hooks/useTrack';\n+\n import ModelIntro from './components/ModelIntro';\n import { MODEL_ITEMS } from './constant';\n import { TrackEnum } from './constants/track';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/components/Actions/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/components/Actions/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,14 +1,16 @@\n-import { RESOURCE_MONITORING_LINK } from '@/constants/global';\n-import useInitialState from '@/hooks/useInitialState';\n-import useTrack from '@/hooks/useTrack';\n-import { deleteTask, pauseTask, rerunTask } from '@/services/modelTrain';\n import { EllipsisOutlined } from '@ant-design/icons';\n import { history } from '@umijs/max';\n-import { Button, Popconfirm, Popover, Space, message } from 'antd';\n+import { Button, message,Popconfirm, Popover, Space } from 'antd';\n import { SpaceSize } from 'antd/es/space';\n import { ButtonSize, ButtonType } from 'antd/lib/button';\n import { memo, useCallback } from 'react';\n-import { STATUS, getApi } from '../../constant';\n+\n+import { RESOURCE_MONITORING_LINK } from '@/constants/global';\n+import useInitialState from '@/hooks/useInitialState';\n+import useTrack from '@/hooks/useTrack';\n+import { deleteTask, pauseTask, rerunTask } from '@/services/modelTrain';\n+\n+import { getApi,STATUS } from '../../constant';\n import { TrackEnum } from '../../track';\n import styles from './index.less';\n \n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/hooks/useGitSecret.ts", + "new_path": "src/pages/ModelTrain/CRH/hooks/useGitSecret.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { queryGitList } from '@/services/trainJob';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { queryGitList } from '@/services/trainJob';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [gitList, setGitList] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/hooks/usePlatformOptions.ts", + "new_path": "src/pages/ModelTrain/CRH/hooks/usePlatformOptions.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import useInitialState from '@/hooks/useInitialState';\n import _ from 'lodash';\n import { useEffect, useState } from 'react';\n \n+import useInitialState from '@/hooks/useInitialState';\n+\n export default ({ ignore = false } = {}) => {\n const { platformOption } = useInitialState();\n const [data, setData] = useState();\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/hooks/useProjectLists.ts", + "new_path": "src/pages/ModelTrain/CRH/hooks/useProjectLists.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,8 @@\n-import useInitialState from '@/hooks/useInitialState';\n import { useAsyncEffect } from 'ahooks';\n import { useCallback, useState } from 'react';\n+\n+import useInitialState from '@/hooks/useInitialState';\n+\n import { getProjectLists } from '../../../../services/modelTrain';\n \n export default ({ ignore = false } = {}) => {\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/hooks/useStorageTypes.ts", + "new_path": "src/pages/ModelTrain/CRH/hooks/useStorageTypes.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,8 @@\n-import { NAS, StarFS, StarFSLabel } from '@/pages/AssetManagement/Storage/constants';\n import { useModel } from '@umijs/max';\n import { useMemo } from 'react';\n+\n+import { NAS, StarFS, StarFSLabel } from '@/pages/AssetManagement/Storage/constants';\n+\n import { cloudMlCrh, kceTj5, nc4Crh, ningxiaCrh, tj5Crh } from '../../../../../config/cluster';\n export default () => {\n const { initialState } = useModel('@@initialState');\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Dataset/Dataset.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Dataset/Dataset.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,3 @@\n-import useRequestData from '@/hooks/useRequestData';\n-import { getDataset } from '@/services/modelTrain';\n import { Alert, Button, Form, Input, Space, Spin, Table, Typography } from 'antd';\n import _ from 'lodash';\n import {\n@@ -12,6 +10,9 @@ import {\n useState,\n } from 'react';\n \n+import useRequestData from '@/hooks/useRequestData';\n+import { getDataset } from '@/services/modelTrain';\n+\n interface DataSource {\n datasetId: number;\n datasetName: string;\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Dataset/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Dataset/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,8 @@\n-import Drawer from '@/components/Drawer';\n import { Button, Input, Space } from 'antd';\n import { memo, useCallback, useRef, useState } from 'react';\n+\n+import Drawer from '@/components/Drawer';\n+\n import DatasetInfo from './Dataset';\n \n interface Ref {\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Resource/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Resource/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n-import useInitialState from '@/hooks/useInitialState';\n-import { getPackageLists } from '@/services/modelTrain';\n import { ReloadOutlined } from '@ant-design/icons';\n import { useAsyncEffect } from 'ahooks';\n import { Button, Spin, Table, Tooltip } from 'antd';\n import React, { memo, useCallback, useMemo, useState } from 'react';\n+\n+import useInitialState from '@/hooks/useInitialState';\n+import { getPackageLists } from '@/services/modelTrain';\n+\n import style from './index.module.less';\n \n const columns = [\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/ResourceInstance/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/ResourceInstance/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n+import { Form, InputNumber, Table } from 'antd';\n+import { memo, useMemo } from 'react';\n+\n import SingleNode from '@/components/ResourceInstance/SingleNode';\n import useTeamResource from '@/hooks/useTeamResource';\n import type { ResourceInstanceList } from '@/types/global';\n-import { Form, InputNumber, Table } from 'antd';\n-import { memo, useMemo } from 'react';\n+\n import styles from './index.less';\n \n const RESOURCE_INSTANCE = [\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Storage/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/Storage/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n+import { Button, Form, Input, Select, Table } from 'antd';\n+import { memo, useEffect, useMemo, useState } from 'react';\n+\n import useInitialState from '@/hooks/useInitialState';\n import { StarFSLabel } from '@/pages/AssetManagement/Storage/constants';\n import { getNasSecrets, getStarFsSecrets } from '@/services/modelTrain';\n import { validMountPath } from '@/utils/validate';\n-import { Button, Form, Input, Select, Table } from 'antd';\n-import { memo, useEffect, useMemo, useState } from 'react';\n+\n import { CLUSTER_STORAGE_TYPE_MAP, STORAGE_TYPE } from '../../../../constant';\n \n const REQUESTS = {\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/Task/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/Task/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,4 @@\n /* eslint-disable prefer-promise-reject-errors */\n-import { isResourceInstance } from '@/cluster';\n-import Image from '@/components/Image';\n-import MultiNode from '@/components/ResourceInstance/MultiNode';\n-import useInitialState from '@/hooks/useInitialState';\n-import CodeConfig from '@/pages/ModelTrain/components/CodeConfig';\n-import CodeMirror from '@/pages/ModelTrain/components/CodeMirrorNew';\n-import { getTaskDetail } from '@/services/modelTrain';\n import { useParams } from '@umijs/max';\n import { Card, Checkbox, Form, Input, InputNumber, Select, Space, Spin } from 'antd';\n import { cloneDeep } from 'lodash';\n@@ -18,7 +11,16 @@ import {\n useMemo,\n useState,\n } from 'react';\n-import { NEED_MODEL_TYPE, getApi } from '../../../constant';\n+\n+import { isResourceInstance } from '@/cluster';\n+import Image from '@/components/Image';\n+import MultiNode from '@/components/ResourceInstance/MultiNode';\n+import useInitialState from '@/hooks/useInitialState';\n+import CodeConfig from '@/pages/ModelTrain/components/CodeConfig';\n+import CodeMirror from '@/pages/ModelTrain/components/CodeMirrorNew';\n+import { getTaskDetail } from '@/services/modelTrain';\n+\n+import { getApi,NEED_MODEL_TYPE } from '../../../constant';\n import usePlatformOptions from '../../../hooks/usePlatformOptions';\n import { str2Object } from '../../../util';\n import Dataset from './Dataset';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Create/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n+import { history } from '@umijs/max';\n+import { Button, message, Space } from 'antd';\n+import { memo, useCallback, useRef, useState } from 'react';\n+\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import useInitialState from '@/hooks/useInitialState';\n import useTrack from '@/hooks/useTrack';\n import { createTask } from '@/services/modelTrain';\n-import { history } from '@umijs/max';\n-import { Button, message, Space } from 'antd';\n-import { memo, useCallback, useRef, useState } from 'react';\n+\n import { getApi } from '../../constant';\n import { TrackEnum } from '../../track';\n import { formatTaskParams } from '../../util';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Detail/Event/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Detail/Event/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n+import { useParams } from '@umijs/max';\n+\n import EventInfo from '@/components/EventInfo';\n import useInitialState from '@/hooks/useInitialState';\n import useRequestData from '@/hooks/useRequestData';\n import { getTaskEvents } from '@/services/modelTrain';\n-import { useParams } from '@umijs/max';\n+\n import { getApi } from '../../../constant';\n export default () => {\n const { cluster } = useInitialState();\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Detail/Logs/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Detail/Logs/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n+import { message } from 'antd';\n+import dayjs from 'dayjs';\n+import { useCallback, useMemo } from 'react';\n+\n import Logs from '@/components/LogInfo';\n import { RESOURCE_MONITORING_LINK } from '@/constants/global';\n import useInitialState from '@/hooks/useInitialState';\n import { queryDownloadPodLogs, queryPodLogs } from '@/services/modelTrain';\n-import { message } from 'antd';\n-import dayjs from 'dayjs';\n-import { useCallback, useMemo } from 'react';\n+\n import { formatLogs } from '../../../../utils';\n import { getApi } from '../../../constant';\n \n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/Detail/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,10 @@\n+import { useParams } from '@umijs/max';\n+import { Button, Card, Space, Spin, Tabs } from 'antd';\n+import classnames from 'classnames';\n+import _, { isEmpty } from 'lodash';\n+import { memo, useMemo, useState } from 'react';\n+import ReactJson from 'react-json-view';\n+\n import { isResourceInstance } from '@/cluster';\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import { DATA_TYPE } from '@/components/Info';\n@@ -13,12 +20,7 @@ import TaskTimeLine from '@/pages/ModelTrain/components/TaskTimeLine';\n import { taskCreateTimeIsAfter } from '@/pages/ModelTrain/utils';\n import { getTaskDetail } from '@/services/modelTrain';\n import { calcTimeInterval } from '@/utils/calcTimeInterval';\n-import { useParams } from '@umijs/max';\n-import { Button, Card, Space, Spin, Tabs } from 'antd';\n-import classnames from 'classnames';\n-import _, { isEmpty } from 'lodash';\n-import { memo, useMemo, useState } from 'react';\n-import ReactJson from 'react-json-view';\n+\n import Actions from '../../components/Actions';\n import { getApi } from '../../constant';\n import { formatJobLogs } from '../../util';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/ProjectList/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/ProjectList/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n+import { ReloadOutlined } from '@ant-design/icons';\n+import { Button, Input, message, Popconfirm, Space, Table, Typography } from 'antd';\n+import { memo, useCallback, useMemo, useState } from 'react';\n+\n import { pagination } from '@/constants/global';\n import useInitialState from '@/hooks/useInitialState';\n import useTrack from '@/hooks/useTrack';\n import { deleteProject } from '@/services/modelTrain';\n-import { ReloadOutlined } from '@ant-design/icons';\n-import { Button, Input, message, Popconfirm, Space, Table, Typography } from 'antd';\n-import { memo, useCallback, useMemo, useState } from 'react';\n+\n import useProjectLists from '../../hooks/useProjectLists';\n import { TrackEnum } from '../../track';\n import { formatTime } from '../../util';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/pages/TaskList/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/pages/TaskList/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,9 @@\n+import { ReloadOutlined } from '@ant-design/icons';\n+import { history, useModel } from '@umijs/max';\n+import { useAntdTable } from 'ahooks';\n+import { Button, Checkbox, Form, Input, Space, Table, Tag, Typography } from 'antd';\n+import { memo, useCallback, useEffect, useMemo } from 'react';\n+\n import { isResourceInstance } from '@/cluster';\n import ResourceItem from '@/components/ResourceInstance/ResourceItem';\n import TableTooltipItem from '@/components/TableTooltipItem';\n@@ -10,13 +16,9 @@ import ListTimeLine from '@/pages/ModelTrain/components/TaskTimeLine/ListTimeLin\n import { taskCreateTimeIsAfter } from '@/pages/ModelTrain/utils';\n import { getTaskLists } from '@/services/modelTrain';\n import { calcTimeInterval } from '@/utils/calcTimeInterval';\n-import { ReloadOutlined } from '@ant-design/icons';\n-import { history, useModel } from '@umijs/max';\n-import { useAntdTable } from 'ahooks';\n-import { Button, Checkbox, Form, Input, Space, Table, Tag, Typography } from 'antd';\n-import { memo, useCallback, useEffect, useMemo } from 'react';\n+\n import Actions from '../../components/Actions';\n-import { STATUS, getApi } from '../../constant';\n+import { getApi,STATUS } from '../../constant';\n import { TrackEnum } from '../../track';\n import { formatTime } from '../../util';\n import style from './index.module.less';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/index.tsx", + "new_path": "src/pages/ModelTrain/CRH/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,10 +1,12 @@\n+import { Button, Space, Tabs } from 'antd';\n+import { useCallback, useMemo, useState } from 'react';\n+\n import { isResourceInstance } from '@/cluster';\n import ContentLayout from '@/components/ContentLayout';\n import useInitialState from '@/hooks/useInitialState';\n import useTrack from '@/hooks/useTrack';\n import { linkToExperiment } from '@/pages/ModelTrain/utils';\n-import { Button, Space, Tabs } from 'antd';\n-import { useCallback, useMemo, useState } from 'react';\n+\n import style from './index.less';\n import ProjectList from './pages/ProjectList';\n import TaskList from './pages/TaskList';\n" + }, + { + "old_path": "src/pages/ModelTrain/CRH/util.ts", + "new_path": "src/pages/ModelTrain/CRH/util.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n /* eslint-disable consistent-return */\n import dayjs from 'dayjs';\n import _ from 'lodash';\n+\n import { STORAGE_TYPE } from './constant';\n import type { JobState, PodState } from './type';\n \n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/DocumentView/index.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/DocumentView/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n import { Card } from 'antd';\n import React, { memo } from 'react';\n+import Draggable from 'react-draggable';\n+\n // eslint-disable-next-line import/no-extraneous-dependencies\n import CodeMirror from '@/pages/ModelSquare/components/CodeMirror';\n-import Draggable from 'react-draggable';\n+\n import styles from './index.less';\n \n interface DocumentViewProps {\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/CodeEditor.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/CodeEditor.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,6 @@\n import 'codemirror/lib/codemirror.css';\n import 'codemirror/mode/shell/shell';\n+\n import { UnControlled as CodeMirror } from 'react-codemirror2';\n \n export default ({ value, onChange }: any) => {\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/StorageMode.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/components/StorageMode.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n-import { validMountPath } from '@/utils/validate';\n import { MinusCircleOutlined } from '@ant-design/icons';\n import { Form, Input, Select } from 'antd';\n import { FormInstance } from 'antd/lib/form';\n import { useMemo } from 'react';\n+\n+import { validMountPath } from '@/utils/validate';\n+\n import styles from '../assets/styles/index.less';\n import { checkFdsStatus, FDS, HDFS, SpaceSize, StarFS, storageTypes } from '../constants';\n \n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useContainerImage.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useContainerImage.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { queryImageList } from '@/services/trainJob';\n import { useModel } from '@umijs/max';\n import { useEffect, useRef, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { queryImageList } from '@/services/trainJob';\n export default (framework: string) => {\n const { initialState } = useModel('@@initialState');\n const imageRef = useRef([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useFramework.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useFramework.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n import { useModel } from '@umijs/max';\n import { useCallback, useEffect, useRef, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n export default (form: any, gpu_type: any, framework: any) => {\n const { initialState } = useModel('@@initialState');\n const [frameworks, setFrameworks] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useGitSecret.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useGitSecret.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { queryGitList } from '@/services/trainJob';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { queryGitList } from '@/services/trainJob';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [gitList, setGitList] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useQuota.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useQuota.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { queryQuota } from '@/services/trainJob';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { queryQuota } from '@/services/trainJob';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [priorities, setPriorities] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useSecretImage.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useSecretImage.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { querySecretImages } from '@/services/trainJob';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { querySecretImages } from '@/services/trainJob';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [imageSecret, setImageSecret] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useStorageList.ts", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/hooks/useStorageList.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n-import type { Option } from '@/pages/Tensorboard/typings';\n-import { queryFdsList, queryHdfsList, queryStarfsList } from '@/services/storage';\n import { useModel } from '@umijs/max';\n import { useEffect, useState } from 'react';\n+\n+import type { Option } from '@/pages/Tensorboard/typings';\n+import { queryFdsList, queryHdfsList, queryStarfsList } from '@/services/storage';\n export default () => {\n const { initialState } = useModel('@@initialState');\n const [fdsList, setFdsList] = useState([]);\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Create/index.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,19 +1,6 @@\n /* eslint-disable no-restricted-syntax */\n /* eslint-disable no-unused-expressions */\n /* eslint-disable no-undef */\n-import { useCallback, useEffect, useMemo, useState } from 'react';\n-// @ts-ignore\n-import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n-import Image from '@/components/Image';\n-import useInitialState from '@/hooks/useInitialState';\n-import useTrack from '@/hooks/useTrack';\n-import useGpus from '@/pages/ModelFinetuning/hooks/useGpus';\n-import { Gi } from '@/pages/ModelService/constants';\n-import { notShow } from '@/pages/ModelTrain/cluster';\n-import CodeConfig from '@/pages/ModelTrain/components/CodeConfig';\n-import CodeMirror from '@/pages/ModelTrain/components/CodeMirrorNew';\n-import DocumentView from '@/pages/ModelTrain/TrainJob/pages/Create/components/DocumentView';\n-import { getTaskDetails, queryCreateTask } from '@/services/trainJob';\n import { CloseOutlined, PlusOutlined } from '@ant-design/icons';\n import { history, useModel, useParams } from '@umijs/max';\n import {\n@@ -31,6 +18,21 @@ import {\n Switch,\n } from 'antd';\n import _ from 'lodash';\n+import { useCallback, useEffect, useMemo, useState } from 'react';\n+\n+// @ts-ignore\n+import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n+import Image from '@/components/Image';\n+import useInitialState from '@/hooks/useInitialState';\n+import useTrack from '@/hooks/useTrack';\n+import useGpus from '@/pages/ModelFinetuning/hooks/useGpus';\n+import { Gi } from '@/pages/ModelService/constants';\n+import { notShow } from '@/pages/ModelTrain/cluster';\n+import CodeConfig from '@/pages/ModelTrain/components/CodeConfig';\n+import CodeMirror from '@/pages/ModelTrain/components/CodeMirrorNew';\n+import DocumentView from '@/pages/ModelTrain/TrainJob/pages/Create/components/DocumentView';\n+import { getTaskDetails, queryCreateTask } from '@/services/trainJob';\n+\n import { TrackEnum } from '../../track';\n import { formatTrainJobDetails } from '../../util';\n import styles from './assets/styles/index.less';\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Detail/EventList.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Detail/EventList.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,9 @@\n+import { history } from '@umijs/max';\n+\n import Event from '@/components/EventInfo';\n import useInitialState from '@/hooks/useInitialState';\n import useRequestData from '@/hooks/useRequestData';\n import { detailsTaskEvent } from '@/services/trainJob';\n-import { history } from '@umijs/max';\n export default () => {\n const { userName } = useInitialState();\n const { loading, data, queryData } = useRequestData({\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Detail/LogInstance.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Detail/LogInstance.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,11 +1,13 @@\n-import Logs from '@/components/LogInfo';\n-import useInitialState from '@/hooks/useInitialState';\n-import { getLogs } from '@/services/trainJob';\n import { useLocation } from '@umijs/max';\n import { useCallback, useMemo } from 'react';\n+\n+import Logs from '@/components/LogInfo';\n // import { RESOURCE_MONITORING_LINK } from '@/constants/global';\n import { LOGS_LINES } from '@/constants/global';\n+import useInitialState from '@/hooks/useInitialState';\n+import { getLogs } from '@/services/trainJob';\n import downloadFile from '@/utils/downloadFile';\n+\n import { formatLogs } from '../../../utils';\n export default ({\n data,\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/pages/Detail/index.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,12 @@\n /* eslint-disable no-plusplus */\n /* eslint-disable guard-for-in */\n /* eslint-disable no-restricted-syntax */\n-import { Button, Card, Popconfirm, Space, Spin, Tabs, message } from 'antd';\n+import { history, useLocation, useModel } from '@umijs/max';\n+import { Button, Card, message,Popconfirm, Space, Spin, Tabs } from 'antd';\n+import _, { isEmpty } from 'lodash';\n import { useEffect, useMemo, useState } from 'react';\n+import ReactJson from 'react-json-view';\n+\n // @ts-ignore\n import ContentLayout, { TypeEnum } from '@/components/ContentLayout';\n import { DATA_TYPE } from '@/components/Info';\n@@ -17,9 +21,7 @@ import { formatJobLogs } from '@/pages/ModelTrain/CRH/util';\n import { changeResource, changeUpdateTime } from '@/pages/ModelTrain/TrainJob/util';\n import { taskCreateTimeIsAfter } from '@/pages/ModelTrain/utils';\n import { isJSONString } from '@/utils/utils';\n-import { history, useLocation, useModel } from '@umijs/max';\n-import _, { isEmpty } from 'lodash';\n-import ReactJson from 'react-json-view';\n+\n import {\n deleteTask,\n getTaskDetails,\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/index.tsx", + "new_path": "src/pages/ModelTrain/TrainJob/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,12 +1,3 @@\n-import ContentLayout from '@/components/ContentLayout';\n-import TableTooltipItem from '@/components/TableTooltipItem';\n-import { HERA_LINK, pagination, RESOURCE_MONITORING_LINK } from '@/constants/global';\n-import useAdmin from '@/hooks/useAdmin';\n-import useSearchStorage from '@/hooks/useSearchStorage';\n-import useTrack from '@/hooks/useTrack';\n-import { notShow } from '@/pages/ModelTrain/cluster';\n-import ListTimeLine from '@/pages/ModelTrain/components/TaskTimeLine/ListTimeLine';\n-import { linkToExperiment, taskCreateTimeIsAfter } from '@/pages/ModelTrain/utils';\n import { CloseOutlined, EllipsisOutlined, ReloadOutlined } from '@ant-design/icons';\n import { history, useModel } from '@umijs/max';\n import { useAntdTable } from 'ahooks';\n@@ -27,6 +18,17 @@ import {\n import type { ColumnsType } from 'antd/es/table';\n import dayjs from 'dayjs';\n import { useEffect, useMemo, useState } from 'react';\n+\n+import ContentLayout from '@/components/ContentLayout';\n+import TableTooltipItem from '@/components/TableTooltipItem';\n+import { HERA_LINK, pagination, RESOURCE_MONITORING_LINK } from '@/constants/global';\n+import useAdmin from '@/hooks/useAdmin';\n+import useSearchStorage from '@/hooks/useSearchStorage';\n+import useTrack from '@/hooks/useTrack';\n+import { notShow } from '@/pages/ModelTrain/cluster';\n+import ListTimeLine from '@/pages/ModelTrain/components/TaskTimeLine/ListTimeLine';\n+import { linkToExperiment, taskCreateTimeIsAfter } from '@/pages/ModelTrain/utils';\n+\n import {\n deleteTask,\n delProjects,\n" + }, + { + "old_path": "src/pages/ModelTrain/TrainJob/util.ts", + "new_path": "src/pages/ModelTrain/TrainJob/util.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,8 @@\n /* eslint-disable no-restricted-syntax */\n-import { isJSONString } from '@/utils/utils';\n import { cloneDeep } from 'lodash';\n \n+import { isJSONString } from '@/utils/utils';\n+\n export function formatTrainJobDetails(res: Record) {\n const request_body = isJSONString(res?.request_body) ? JSON.parse(res?.request_body) : null;\n const data = cloneDeep(request_body);\n" + }, + { + "old_path": "src/pages/ModelTrain/components/CodeConfig/BranchSelect.tsx", + "new_path": "src/pages/ModelTrain/components/CodeConfig/BranchSelect.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,7 @@\n-import SearchSelect from '@/components/SearchSelect';\n import { Input, Space } from 'antd';\n+\n+import SearchSelect from '@/components/SearchSelect';\n+\n import styles from './index.less';\n \n const BranchSelect = (props: any) => {\n" + }, + { + "old_path": "src/pages/ModelTrain/components/CodeConfig/index.tsx", + "new_path": "src/pages/ModelTrain/components/CodeConfig/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,7 @@\n+import { Button, Form, Input, Select } from 'antd';\n+import { SelectProps } from 'antd/es/select';\n+import { useCallback, useEffect, useMemo, useState } from 'react';\n+\n import useInitialState from '@/hooks/useInitialState';\n import useRequestData from '@/hooks/useRequestData';\n import GitVersion from '@/pages/AssetManagement/Code/components/GitVersion';\n@@ -5,9 +9,7 @@ import CreateModal from '@/pages/AssetManagement/Code/pages/CreateModal';\n import BranchSelect from '@/pages/ModelTrain/components/CodeConfig/BranchSelect';\n import { queryTrainCodeList } from '@/services/code';\n import { getGitlabBranch } from '@/services/global';\n-import { Button, Form, Input, Select } from 'antd';\n-import { SelectProps } from 'antd/es/select';\n-import { useCallback, useEffect, useMemo, useState } from 'react';\n+\n import style from './index.less';\n \n const CodeConfig = ({ form, detailData }: any) => {\n" + }, + { + "old_path": "src/pages/ModelTrain/components/CodeMirrorNew/index.tsx", + "new_path": "src/pages/ModelTrain/components/CodeMirrorNew/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,13 +1,14 @@\n /* eslint-disable react/no-unknown-property */\n-import { CopyOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons';\n-import { useFullscreen } from 'ahooks';\n-import { Space, Typography } from 'antd';\n-import classnames from 'classnames';\n import 'codemirror/addon/edit/closebrackets';\n import 'codemirror/lib/codemirror.css';\n import 'codemirror/mode/javascript/javascript.js';\n import 'codemirror/mode/shell/shell';\n import 'codemirror/theme/eclipse.css';\n+\n+import { CopyOutlined, FullscreenExitOutlined, FullscreenOutlined } from '@ant-design/icons';\n+import { useFullscreen } from 'ahooks';\n+import { Space, Typography } from 'antd';\n+import classnames from 'classnames';\n import { CSSProperties, useCallback, useRef, useState } from 'react';\n import { Controlled as CodeMirror } from 'react-codemirror2';\n \n" + }, + { + "old_path": "src/pages/ModelTrain/components/TaskTimeLine/ListTimeLine.tsx", + "new_path": "src/pages/ModelTrain/components/TaskTimeLine/ListTimeLine.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -2,6 +2,7 @@ import { InfoCircleOutlined, SyncOutlined } from '@ant-design/icons';\n import { Popover, Tag, Timeline } from 'antd';\n import dayjs from 'dayjs';\n import { memo, useMemo } from 'react';\n+\n import { KEYS, TASK_MAP, TaskTimeLineProps } from './constant';\n import useDefaultParams from './hooks';\n import styles from './index.less';\n" + }, + { + "old_path": "src/pages/ModelTrain/components/TaskTimeLine/hooks.ts", + "new_path": "src/pages/ModelTrain/components/TaskTimeLine/hooks.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,5 +1,6 @@\n import _ from 'lodash';\n import { useCallback, useMemo } from 'react';\n+\n import { KEYS, TaskTimeLineProps } from './constant';\n \n export default (props: TaskTimeLineProps) => {\n" + }, + { + "old_path": "src/pages/ModelTrain/components/TaskTimeLine/index.tsx", + "new_path": "src/pages/ModelTrain/components/TaskTimeLine/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,9 +1,11 @@\n-import calcTimeInterval from '@/utils/calcTimeInterval';\n import { SyncOutlined } from '@ant-design/icons';\n import { Tag, Timeline } from 'antd';\n import classnames from 'classnames';\n import dayjs from 'dayjs';\n import { memo } from 'react';\n+\n+import calcTimeInterval from '@/utils/calcTimeInterval';\n+\n import { KEYS, TASK_MAP, TaskTimeLineProps } from './constant';\n import useDefaultParams from './hooks';\n import styles from './index.less';\n" + }, + { + "old_path": "src/pages/ModelTrain/utils/index.ts", + "new_path": "src/pages/ModelTrain/utils/index.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n // 格式化日志信息\n import dayjs from 'dayjs';\n import _ from 'lodash';\n+\n import { kceTj5 } from '../../../../config/cluster';\n \n export function formatLogs(logs: any) {\n" + }, + { + "old_path": "src/pages/Overview/components/DocumentView/index.tsx", + "new_path": "src/pages/Overview/components/DocumentView/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n import { CloseOutlined, LinkOutlined } from '@ant-design/icons';\n import { Button, Card, Space, Typography } from 'antd';\n import { useMemo } from 'react';\n+\n import styles from './index.less';\n \n const DocumentView = ({ onRef, link }: { onRef: any; link: string }) => {\n" + }, + { + "old_path": "src/pages/Overview/components/Flowchart/index.tsx", + "new_path": "src/pages/Overview/components/Flowchart/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,7 +1,9 @@\n-import { IInitialState } from '@/app';\n-import useSetTour from '@/components/Tour/useSetTour';\n import { history, useModel } from '@umijs/max';\n import React from 'react';\n+\n+import { IInitialState } from '@/app';\n+import useSetTour from '@/components/Tour/useSetTour';\n+\n import code from '../../assets/imgs/code.png';\n import code_active from '../../assets/imgs/code_active.png';\n import image from '../../assets/imgs/image.png';\n" + }, + { + "old_path": "src/pages/Overview/components/MenuModules/index.tsx", + "new_path": "src/pages/Overview/components/MenuModules/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,8 +1,10 @@\n+import { history, useModel } from '@umijs/max';\n+import { Card } from 'antd';\n+\n import { IInitialState } from '@/app';\n import useSetTour from '@/components/Tour/useSetTour';\n import useTrack from '@/hooks/useTrack';\n-import { history, useModel } from '@umijs/max';\n-import { Card } from 'antd';\n+\n import { MENU_MAP } from '../../constants';\n import { TrackEnum } from '../../constants/track';\n import styles from './index.less';\n" + }, + { + "old_path": "src/pages/Overview/pages/NoEntry/index.tsx", + "new_path": "src/pages/Overview/pages/NoEntry/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,6 +1,7 @@\n-import styles from '@/pages/Overview/pages/TeamSelect/index.less';\n import { history, useModel } from '@umijs/max';\n import { Button, Typography } from 'antd';\n+\n+import styles from '@/pages/Overview/pages/TeamSelect/index.less';\n const NoEntry = ({ routeProps }: { routeProps: Record }) => {\n const { initialState } = useModel('@@initialState');\n return (\n" + }, + { + "old_path": "src/pages/Overview/pages/TeamSelect/index.tsx", + "new_path": "src/pages/Overview/pages/TeamSelect/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,4 +1,8 @@\n /* eslint-disable no-nested-ternary */\n+import { history, useModel } from '@umijs/max';\n+import { Button, Select, Space, Typography } from 'antd';\n+import { useEffect, useState } from 'react';\n+\n import { IInitialState } from '@/app';\n import NoFoundContent from '@/components/NoFoundContent';\n import WorkSpaceCreate from '@/components/WorkSpaceCreate';\n@@ -6,9 +10,7 @@ import OldWorkSpaceCreate from '@/components/WorkSpaceCreate/OldWorkSpaceCreate'\n import useTrack from '@/hooks/useTrack';\n import { isNewTeamList } from '@/pages/WorkSpace/cluster';\n import { queryTeamList } from '@/services/team';\n-import { history, useModel } from '@umijs/max';\n-import { Button, Select, Space, Typography } from 'antd';\n-import { useEffect, useState } from 'react';\n+\n import { TrackEnum } from '../../constants/track';\n import styles from './index.less';\n const TeamSelect = ({ routeProps }: { routeProps: Record }) => {\n" + }, + { + "old_path": "src/pages/Overview/index.tsx", + "new_path": "src/pages/Overview/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,3 +1,8 @@\n+import { CloseOutlined, LinkOutlined } from '@ant-design/icons';\n+import { history, useModel } from '@umijs/max';\n+import { Button, Card, Space, Tour, Typography } from 'antd';\n+import React, { useContext, useMemo, useState } from 'react';\n+\n import DocumentView from '@/components/DocumentView';\n import useLocalStorage from '@/hooks/useLocalStorage';\n import useTrack from '@/hooks/useTrack';\n@@ -6,10 +11,7 @@ import { Overview__Tour__Key } from '@/layouts/constants';\n import styles from '@/pages/Overview/assets/styles/index.less';\n import Flowchart from '@/pages/Overview/components/Flowchart';\n import MenuModules from '@/pages/Overview/components/MenuModules';\n-import { CloseOutlined, LinkOutlined } from '@ant-design/icons';\n-import { history, useModel } from '@umijs/max';\n-import { Button, Card, Space, Tour, Typography } from 'antd';\n-import React, { useContext, useMemo, useState } from 'react';\n+\n import { TrackEnum } from './constants/track';\n const Overview = () => {\n const { trackClickHandle } = useTrack(TrackEnum.PageName);\n" + }, + { + "old_path": "src/pages/PAIDLC/components/BaseCodeMirror/CodeMoirror.tsx", + "new_path": "src/pages/PAIDLC/components/BaseCodeMirror/CodeMoirror.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -2,9 +2,10 @@\n import 'codemirror/lib/codemirror.css';\n import 'codemirror/mode/shell/shell';\n import 'codemirror/theme/material.css';\n-import { UnControlled as CodeMirror } from 'react-codemirror2';\n import './styles/index.less';\n \n+import { UnControlled as CodeMirror } from 'react-codemirror2';\n+\n export default ({ data }: { data: string[] }) => {\n return (\n {\n const terminalDomRef = useRef(null);\n const xtermRef = useRef();\n" + }, + { + "old_path": "src/pages/PAIDLC/components/Container/WebTerm.tsx", + "new_path": "src/pages/PAIDLC/components/Container/WebTerm.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "@@ -1,13 +1,13 @@\n /* eslint-disable no-inner-declarations */\n /* eslint-disable no-console */\n+import 'xterm/css/xterm.css';\n+\n import { forwardRef, memo, useEffect, useImperativeHandle, useRef } from 'react';\n import { Terminal } from 'xterm';\n import { FitAddon } from 'xterm-addon-fit';\n import { SearchAddon } from 'xterm-addon-search';\n import { WebLinksAddon } from 'xterm-addon-web-links';\n \n-import 'xterm/css/xterm.css';\n-\n const WebTerm = forwardRef(({ wssUrl }: { wssUrl: string }, ref) => {\n const terminalDomRef = useRef(null);\n const xtermRef = useRef();\n" + }, + { + "old_path": "src/pages/PAIDLC/components/Container/index.tsx", + "new_path": "src/pages/PAIDLC/components/Container/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/Dataset/index.tsx", + "new_path": "src/pages/PAIDLC/components/Dataset/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/Events/index.old.tsx", + "new_path": "src/pages/PAIDLC/components/Events/index.old.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/Events/index.tsx", + "new_path": "src/pages/PAIDLC/components/Events/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/Instance/index.tsx", + "new_path": "src/pages/PAIDLC/components/Instance/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/LogsModal/Event.tsx", + "new_path": "src/pages/PAIDLC/components/LogsModal/Event.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/LogsModal/Instance.tsx", + "new_path": "src/pages/PAIDLC/components/LogsModal/Instance.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/LogsModal/index.tsx", + "new_path": "src/pages/PAIDLC/components/LogsModal/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/components/SourceView/index.tsx", + "new_path": "src/pages/PAIDLC/components/SourceView/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/constants/downloadCsv.ts", + "new_path": "src/pages/PAIDLC/constants/downloadCsv.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/constants/index.tsx", + "new_path": "src/pages/PAIDLC/constants/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/hooks/useClusters.ts", + "new_path": "src/pages/PAIDLC/hooks/useClusters.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/hooks/useCodeSelect.ts", + "new_path": "src/pages/PAIDLC/hooks/useCodeSelect.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/hooks/useFramework.ts", + "new_path": "src/pages/PAIDLC/hooks/useFramework.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/hooks/useQuota.ts", + "new_path": "src/pages/PAIDLC/hooks/useQuota.ts", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/pages/Create/index.tsx", + "new_path": "src/pages/PAIDLC/pages/Create/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/pages/Detail/index.tsx", + "new_path": "src/pages/PAIDLC/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/pages/webTerm/index.tsx", + "new_path": "src/pages/PAIDLC/pages/webTerm/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/PAIDLC/index.tsx", + "new_path": "src/pages/PAIDLC/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/components/Create.tsx", + "new_path": "src/pages/Tensorboard/components/Create.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/components/CreateModal.tsx", + "new_path": "src/pages/Tensorboard/components/CreateModal.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/constants/index.tsx", + "new_path": "src/pages/Tensorboard/constants/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/pages/Detail/Event.tsx", + "new_path": "src/pages/Tensorboard/pages/Detail/Event.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/pages/Detail/index.tsx", + "new_path": "src/pages/Tensorboard/pages/Detail/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + }, + { + "old_path": "src/pages/Tensorboard/index.tsx", + "new_path": "src/pages/Tensorboard/index.tsx", + "a_mode": "100644", + "b_mode": "100644", + "new_file": false, + "renamed_file": false, + "deleted_file": false, + "diff": "" + } + ], + "overflow": false +} \ No newline at end of file diff --git a/script/mr/comments.json b/script/mr/comments.json new file mode 100644 index 0000000..deab64d --- /dev/null +++ b/script/mr/comments.json @@ -0,0 +1,443 @@ +[ + { + "id": 9591828, + "type": null, + "body": "mentioned in commit 17a35cfb47b46e85f507c5f602907ffc429d40c0", + "attachment": null, + "author": { + "id": 30382, + "username": "wuting7", + "name": "吴婷", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/30382/avatar.png", + "web_url": "https://git.n.xiaomi.com/wuting7" + }, + "created_at": "2024-08-09T10:54:28.295+08:00", + "updated_at": "2024-08-09T10:54:28.297+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591827, + "type": null, + "body": "approved this merge request", + "attachment": null, + "author": { + "id": 30382, + "username": "wuting7", + "name": "吴婷", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/30382/avatar.png", + "web_url": "https://git.n.xiaomi.com/wuting7" + }, + "created_at": "2024-08-09T10:54:25.753+08:00", + "updated_at": "2024-08-09T10:54:25.755+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591699, + "type": null, + "body": "resolved all threads", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:49:03.570+08:00", + "updated_at": "2024-08-09T10:49:03.577+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591698, + "type": "DiffNote", + "body": "删完了捏", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:49:03.134+08:00", + "updated_at": "2024-08-09T10:49:03.134+08:00", + "system": false, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "commit_id": null, + "position": { + "base_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "start_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "head_sha": "4e7ef3dfd9a731f265c0b7e65d96476ad35e1643", + "old_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "new_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "position_type": "text", + "old_line": null, + "new_line": 179, + "line_range": { + "start": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + }, + "end": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + } + } + }, + "resolvable": true, + "resolved": true, + "resolved_by": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "resolved_at": "2024-08-09T10:49:03.545+08:00", + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591676, + "type": null, + "body": "added 1 commit\n\n
  • 9af87594 - chore: 删除示例数据
\n\n[Compare with previous version](/cloudml-visuals/fe/cloud-ml-fe/-/merge_requests/477/diffs?diff_id=6505933&start_sha=4e7ef3dfd9a731f265c0b7e65d96476ad35e1643)", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:48:17.487+08:00", + "updated_at": "2024-08-09T10:48:17.489+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591675, + "type": "DiffNote", + "body": "changed this line in [version 2 of the diff](/cloudml-visuals/fe/cloud-ml-fe/-/merge_requests/477/diffs?diff_id=6505933&start_sha=4e7ef3dfd9a731f265c0b7e65d96476ad35e1643#cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_179_160)", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:48:17.244+08:00", + "updated_at": "2024-08-09T10:48:17.244+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "commit_id": null, + "position": { + "base_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "start_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "head_sha": "4e7ef3dfd9a731f265c0b7e65d96476ad35e1643", + "old_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "new_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "position_type": "text", + "old_line": null, + "new_line": 179, + "line_range": { + "start": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + }, + "end": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + } + } + }, + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591335, + "type": "DiffNote", + "body": "算了，我改到example里吧", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:34:10.533+08:00", + "updated_at": "2024-08-09T10:34:10.533+08:00", + "system": false, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "commit_id": null, + "position": { + "base_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "start_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "head_sha": "4e7ef3dfd9a731f265c0b7e65d96476ad35e1643", + "old_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "new_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "position_type": "text", + "old_line": null, + "new_line": 179, + "line_range": { + "start": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + }, + "end": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + } + } + }, + "resolvable": true, + "resolved": true, + "resolved_by": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "resolved_at": "2024-08-09T10:49:03.545+08:00", + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591318, + "type": null, + "body": "resolved all threads", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:33:43.448+08:00", + "updated_at": "2024-08-09T10:33:43.454+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9591317, + "type": "DiffNote", + "body": "只是删了引用，留点原始数据好看格式", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-09T10:33:42.907+08:00", + "updated_at": "2024-08-09T10:33:42.907+08:00", + "system": false, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "commit_id": null, + "position": { + "base_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "start_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "head_sha": "4e7ef3dfd9a731f265c0b7e65d96476ad35e1643", + "old_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "new_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "position_type": "text", + "old_line": null, + "new_line": 179, + "line_range": { + "start": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + }, + "end": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + } + } + }, + "resolvable": true, + "resolved": true, + "resolved_by": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "resolved_at": "2024-08-09T10:49:03.545+08:00", + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9581569, + "type": "DiffNote", + "body": "mock 数据不是都删了麽？", + "attachment": null, + "author": { + "id": 30382, + "username": "wuting7", + "name": "吴婷", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/30382/avatar.png", + "web_url": "https://git.n.xiaomi.com/wuting7" + }, + "created_at": "2024-08-08T15:20:24.391+08:00", + "updated_at": "2024-08-08T15:20:24.391+08:00", + "system": false, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "commit_id": null, + "position": { + "base_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "start_sha": "e65a68d698f0e731285b4fbdee34102a21442803", + "head_sha": "4e7ef3dfd9a731f265c0b7e65d96476ad35e1643", + "old_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "new_path": "src/pages/AIWorkbench/typings/workflowIns.ts", + "position_type": "text", + "old_line": null, + "new_line": 179, + "line_range": { + "start": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + }, + "end": { + "line_code": "cf42380df1ea3d449fda4ef0d59a9e3a2d02aeb3_174_179", + "type": "new", + "old_line": null, + "new_line": 179 + } + } + }, + "resolvable": true, + "resolved": true, + "resolved_by": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "resolved_at": "2024-08-09T10:49:03.545+08:00", + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9581351, + "type": null, + "body": "assigned to @zhaoyingbo", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-08T15:11:28.865+08:00", + "updated_at": "2024-08-08T15:11:28.891+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + }, + { + "id": 9581349, + "type": null, + "body": "requested review from @wuting7", + "attachment": null, + "author": { + "id": 10011, + "username": "zhaoyingbo", + "name": "赵英博", + "state": "active", + "avatar_url": "https://git.n.xiaomi.com/uploads/-/system/user/avatar/10011/avatar.png", + "web_url": "https://git.n.xiaomi.com/zhaoyingbo" + }, + "created_at": "2024-08-08T15:11:28.338+08:00", + "updated_at": "2024-08-08T15:11:28.340+08:00", + "system": true, + "noteable_id": 2351580, + "noteable_type": "MergeRequest", + "resolvable": false, + "confidential": false, + "noteable_iid": 477, + "commands_changes": {} + } +] \ No newline at end of file diff --git a/script/mr/event.json b/script/mr/event.json new file mode 100644 index 0000000..2f32e8e --- /dev/null +++ b/script/mr/event.json @@ -0,0 +1,17 @@ +{ + "object_kind": "merge_request", + "event_type": "merge_request", + "project": { + "id": 139032 + }, + "object_attributes": { + "iid": 490, + "state": "merged", + "changes": { + "updated_at": { + "previous": "2021-07-01 10:00:00 UTC", + "current": "2021-07-01 10:30:00 UTC" + } + } + } +} \ No newline at end of file diff --git a/service/gitlab/discussions.ts b/service/gitlab/discussions.ts new file mode 100644 index 0000000..ac94033 --- /dev/null +++ b/service/gitlab/discussions.ts @@ -0,0 +1,64 @@ +import { DiscussionSchema } from "@gitbeaker/rest" + +import netTool from "../netTool" +import { GITLAB_AUTH_HEADER, GITLAB_BASE_URL, gitlabReqWarp } from "./tools" + +export interface CreateRangeDiscussionPosition { + base_sha: string + start_sha: string + head_sha: string + new_path: string + old_path: string + position_type: "text" + new_line: number + line_range: { + start: { + line_code: string + } + end: { + line_code: string + } + } +} + +/** + * 获取合并请求的讨论列表。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @returns {Promise} 返回包含讨论列表的Promise。 + */ +const getList = async (project_id: number, merge_request_iid: number) => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/discussions` + return gitlabReqWarp( + () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), + [] + ) +} + +/** + * 创建合并请求的讨论。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @param {string} body - 讨论内容。 + * @param {CreateRangeDiscussionPosition} position - 讨论位置。 + * @returns {Promise} 返回包含创建的讨论的Promise。 + */ +const create2Mr = async ( + project_id: number, + merge_request_iid: number, + body: string, + position: CreateRangeDiscussionPosition +) => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/discussions` + return gitlabReqWarp( + () => netTool.post(URL, { body, position }, {}, GITLAB_AUTH_HEADER), + null + ) +} + +const discussions = { + getList, + create2Mr, +} + +export default discussions diff --git a/service/gitlab/index.ts b/service/gitlab/index.ts index c247995..e595dea 100644 --- a/service/gitlab/index.ts +++ b/service/gitlab/index.ts @@ -1,5 +1,8 @@ import badge from "./badge" import commit from "./commit" +import discussions from "./discussions" +import mr from "./mr" +import note from "./note" import pipeline from "./pipeline" import project from "./project" @@ -8,6 +11,9 @@ const gitlab = { badge, commit, pipeline, + mr, + note, + discussions, } export default gitlab diff --git a/service/gitlab/mr.ts b/service/gitlab/mr.ts index 108e905..709f938 100644 --- a/service/gitlab/mr.ts +++ b/service/gitlab/mr.ts @@ -1,20 +1,84 @@ +import type { + ExpandedMergeRequestSchema, + MergeRequestChangesSchema, + MergeRequestDiffVersionsSchema, + MergeRequestNoteSchema, +} from "@gitbeaker/rest" + import netTool from "../netTool" import { GITLAB_AUTH_HEADER, GITLAB_BASE_URL, gitlabReqWarp } from "./tools" -const getDiffs = async (project_id: number, merge_request_iid: number) => { +/** + * 获取合并请求的评论，支持分页。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @param {number} [page=1] - 页码。 + * @param {number} [per_page=20] - 每页的评论数。 + * @returns {Promise} 返回包含评论的Promise。 + */ +const getComments = async ( + project_id: number, + merge_request_iid: number, + page: number = 1, + per_page: number = 20 +): Promise => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/notes?page=${page}&per_page=${per_page}` + return gitlabReqWarp( + () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), + [] + ) +} + +/** + * 获取合并请求的变更。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @returns {Promise} 返回包含变更的Promise。 + */ +const getChanges = async (project_id: number, merge_request_iid: number) => { const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/changes` - const res = await gitlabReqWarp( + return gitlabReqWarp( () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), null ) - if (res === null) return null - return res +} + +/** + * 获取合并请求的详细信息。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @returns {Promise} 返回包含详细信息的Promise。 + */ +const getDetail = async (project_id: number, merge_request_iid: number) => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}` + return gitlabReqWarp( + () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), + null + ) +} + +/** + * 获取合并请求的差异版本。 + * @param {number} project_id - 项目ID。 + * @param {number} merge_request_iid - 合并请求IID。 + * @returns {Promise} 返回包含差异版本的Promise。 + */ +const getDiffVersions = async ( + project_id: number, + merge_request_iid: number +) => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/versions` + return gitlabReqWarp( + () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), + [] + ) } const mr = { - getDiffs, + getChanges, + getDetail, + getComments, + getDiffVersions, } export default mr - -getDiffs(139032, 484).then(console.log) diff --git a/service/gitlab/note.ts b/service/gitlab/note.ts new file mode 100644 index 0000000..824aeb1 --- /dev/null +++ b/service/gitlab/note.ts @@ -0,0 +1,51 @@ +import { MergeRequestNoteSchema } from "@gitbeaker/rest" + +import netTool from "../netTool" +import { GITLAB_AUTH_HEADER, GITLAB_BASE_URL, gitlabReqWarp } from "./tools" + +/** + * 创建一个新的合并请求备注 + * @param {number} project_id - 项目ID + * @param {number} merge_request_iid - 合并请求IID + * @param {string} body - 备注内容 + * @returns {Promise} - 返回包含新创建备注的Promise + */ +const create2Mr = async ( + project_id: number, + merge_request_iid: number, + body: string +): Promise => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/notes` + return gitlabReqWarp( + () => netTool.post(URL, { body }, {}, GITLAB_AUTH_HEADER), + null + ) +} + +/** + * 修改一个现有的合并请求备注 + * @param {number} project_id - 项目ID + * @param {number} merge_request_iid - 合并请求IID + * @param {number} note_id - 备注ID + * @param {string} body - 新的备注内容 + * @returns {Promise} - 返回包含修改后备注的Promise + */ +const modify2Mr = async ( + project_id: number, + merge_request_iid: number, + note_id: number, + body: string +): Promise => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/merge_requests/${merge_request_iid}/notes/${note_id}` + return gitlabReqWarp( + () => netTool.put(URL, { body }, {}, GITLAB_AUTH_HEADER), + null + ) +} + +const note = { + create2Mr, + modify2Mr, +} + +export default note diff --git a/service/gitlab/repository.ts b/service/gitlab/repository.ts new file mode 100644 index 0000000..ed4e28f --- /dev/null +++ b/service/gitlab/repository.ts @@ -0,0 +1,27 @@ +import netTool from "../netTool" +import { GITLAB_AUTH_HEADER, GITLAB_BASE_URL, gitlabReqWarp } from "./tools" + +/** + * 获取指定项目中某个文件的内容。 + * @param {number} project_id - 项目ID。 + * @param {string} path - 文件路径。 + * @param {string} ref - 分支或标签名称。 + * @returns {Promise} 返回包含文件内容的Promise。 + */ +const getFileContent = async ( + project_id: number, + path: string, + ref: string +) => { + const URL = `${GITLAB_BASE_URL}/projects/${project_id}/repository/files/${encodeURIComponent(path)}/raw?ref=${ref}` + return gitlabReqWarp( + () => netTool.get(URL, {}, GITLAB_AUTH_HEADER), + "" + ) +} + +const repository = { + getFileContent, +} + +export default repository diff --git a/service/netTool.ts b/service/netTool.ts index e059f9b..5ba4cbf 100644 --- a/service/netTool.ts +++ b/service/netTool.ts @@ -33,7 +33,7 @@ const logResponse = ( requestBody, responseBody, } - console.log("🚀 ~ responseLog:", JSON.stringify(responseLog, null, 2)) + // console.log("🚀 ~ responseLog:", JSON.stringify(responseLog, null, 2)) return responseLog } diff --git a/test/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json b/test/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json new file mode 100644 index 0000000..aedd43e --- /dev/null +++ b/test/log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json @@ -0,0 +1,15 @@ +{ + "keep": { + "days": true, + "amount": 14 + }, + "auditLog": "log/.477ef71694ce4c791e6f91cf40117d4a85785c6b-audit.json", + "files": [ + { + "date": 1723423178431, + "name": "log/application-2024-08-12.log", + "hash": "0bc427a58e73e382ac12bffa78e2d17ab09717e51a940fe5d71f786f5f1e6bcf" + } + ], + "hashType": "sha256" +} \ No newline at end of file diff --git a/test/manageGitlabEventReq.test.ts b/test/manageGitlabEventReq.test.ts index cef1277..b6f9514 100644 --- a/test/manageGitlabEventReq.test.ts +++ b/test/manageGitlabEventReq.test.ts @@ -1,5 +1,6 @@ import { expect, test } from "bun:test" +import loggerIns from "../log" import { manageGitlabEventReq } from "../routes/event" import netTool from "../service/netTool" import { Gitlab } from "../types/gitlab" @@ -59,6 +60,8 @@ test("manageGitlabEventReq", async () => { } ) - const res = await manageGitlabEventReq(req) + const logger = loggerIns.child({ name: "test" }) + + const res = await manageGitlabEventReq(req, logger) expect(res).toEqual(netTool.ok()) }) diff --git a/test/manageMrEvent.test.ts b/test/manageMrEvent.test.ts new file mode 100644 index 0000000..912d253 --- /dev/null +++ b/test/manageMrEvent.test.ts @@ -0,0 +1,38 @@ +import { expect, test } from "bun:test" + +import loggerIns from "../log" +import { manageGitlabEventReq } from "../routes/event" +import netTool from "../service/netTool" +import { Gitlab } from "../types/gitlab" + +test("manageMrEvent", async () => { + const headers = new Headers({ + "x-gitlab-token": "uwnpzb9hvoft28h", + "x-gitlab-event": "Merge Request Hook", + }) + + const body: Gitlab.MergeRequestEvent = { + object_kind: "merge_request", + event_type: "merge_request", + project: { + id: 139032, + }, + object_attributes: { + iid: 502, + state: "opened", + }, + } + + const req = new Request( + "https://lark-egg.ai.xiaomi.com/gitlab_monitor/event", + { + method: "POST", + headers: headers, + body: JSON.stringify(body), + } + ) + + const logger = loggerIns.child({ requestId: "test" }) + const res = await manageGitlabEventReq(req, logger) + expect(res).toEqual(netTool.ok()) +}, 100000) diff --git a/test/parseReview.test.ts b/test/parseReview.test.ts new file mode 100644 index 0000000..d0e016b --- /dev/null +++ b/test/parseReview.test.ts @@ -0,0 +1,32 @@ +import { test } from "bun:test" + +import diffTools from "../controllers/manageMrEvent/utils/diffTools" +import loggerIns from "../log" + +test("parseReview", async () => { + const logger = loggerIns.child({ requestId: "test" }) + const response = ` + 1-12: +LGTM! +--- +67-70: +在生产环境中，\`console.log\`可能会导致性能问题，建议移除或使用更合适的方式进行调试。 +\`\`\`diff +- console.log( +- '🚀 ~ file: index.tsx:68 ~ ModelSquare ~ item.apiDoc:', +- item.apiDoc, +- ); +\`\`\` +--- +` + const diffs = [ + [ + 1, + 12, + "\\n---new_hunk---\\n```\\n import { Button, Space, Tag, Typography } from 'antd';\\n import classnames from 'classnames';\\n import { memo } from 'react';\\n4: \\n5: import ChatGLM from '../../assets/ChatGLM.png';\\n6: import CVLM from '../../assets/CVLM.png';\\n7: import inner from '../../assets/inner.png';\\n8: import Llama from '../../assets/Llama.png';\\n9: import MICV from '../../assets/MICV.png';\\n import MiniGPT from '../../assets/MiniGPT.png';\\n import Mixtral from '../../assets/Mixtral.png';\\n import Qwen from '../../assets/Qwen.png';\\n```\\n\\n---old_hunk---\\n```\\n import { Button, Space, Tag, Typography } from 'antd';\\n import classnames from 'classnames';\\n import { memo } from 'react';\\n import ChatGLM from '../../assets/ChatGLM.png';\\n import inner from '../../assets/inner.png';\\n import Llama from '../../assets/Llama.png';\\n import MiniGPT from '../../assets/MiniGPT.png';\\n import Mixtral from '../../assets/Mixtral.png';\\n import Qwen from '../../assets/Qwen.png';\\n```\\n ", + ], + ] as Array<[number, number, string]> + + const res = diffTools.parseReview(response, diffs) + logger.info(JSON.stringify(res)) +}, 100000) diff --git a/test/pathFilter.test.ts b/test/pathFilter.test.ts new file mode 100644 index 0000000..ed065ef --- /dev/null +++ b/test/pathFilter.test.ts @@ -0,0 +1,28 @@ +import { expect, test } from "bun:test" + +import { PathFilter } from "../controllers/manageMrEvent/utils/pathFilter" + +// 测试用例 +test("PathFilter check method", () => { + // 示例规则数组 + const rules = [ + "*.js", // 包含所有.js文件 + "!*.test.js", // 排除所有.test.js文件 + "src/**", // 包含src目录下的所有文件 + "!src/tmp/**", // 排除src/tmp目录下的所有文件 + ] + + // 创建PathFilter实例 + const pathFilter = new PathFilter(rules) + // 测试包含.js文件 + expect(pathFilter.check("example.js")).toBe(true) + + // 测试排除.test.js文件 + expect(pathFilter.check("example.test.js")).toBe(false) + + // 测试包含src目录下的文件 + expect(pathFilter.check("src/index.js")).toBe(true) + + // 测试排除src/tmp目录下的文件 + expect(pathFilter.check("src/tmp/temp.js")).toBe(false) +}) diff --git a/test/service/discussion.test.ts b/test/service/discussion.test.ts new file mode 100644 index 0000000..1f2dcc0 --- /dev/null +++ b/test/service/discussion.test.ts @@ -0,0 +1,43 @@ +import { test } from "bun:test" + +import service from "../../service" + +// 测试用例 +test("Gitlab Discussion", async () => { + const project_id = 139032 + const merge_request_iid = 488 + + const res = await service.gitlab.discussions.getList( + project_id, + merge_request_iid + ) + console.log(res) + + const body = "LGTM!" + const position: any = { + base_sha: "17a35cfb47b46e85f507c5f602907ffc429d40c0", + start_sha: "2d6f9d6d5cbfd323e06e37859ee9b19c3578619c", + head_sha: "710458e37476915e585d480961786e7eedbc79fb", + old_path: "src/pages/AIWorkbench/controller/index.ts", + new_path: "src/pages/AIWorkbench/controller/index.ts", + position_type: "text", + new_line: 21, + line_range: { + start: { + line_code: "6988b6e297ca054b9ffaa69f4a0f4a954e749f78_0_21", + }, + end: { + line_code: "6988b6e297ca054b9ffaa69f4a0f4a954e749f78_0_25", + }, + }, + } + + const res2 = await service.gitlab.discussions.create2Mr( + project_id, + merge_request_iid, + body, + position + ) + + console.log(res2) +}, 10000) diff --git a/test/service/mr.test.ts b/test/service/mr.test.ts new file mode 100644 index 0000000..383a483 --- /dev/null +++ b/test/service/mr.test.ts @@ -0,0 +1,15 @@ +import { test } from "bun:test" + +import service from "../../service" + +// 测试用例 +test("Gitlab MR", async () => { + const project_id = 139032 + const merge_request_iid = 4889 + + const res = await service.gitlab.mr.getDiffVersions( + project_id, + merge_request_iid + ) + console.log(res) +}, 10000) diff --git a/test/service/note.test.ts b/test/service/note.test.ts new file mode 100644 index 0000000..c92083a --- /dev/null +++ b/test/service/note.test.ts @@ -0,0 +1,41 @@ +import { test } from "bun:test" + +import service from "../../service" + +const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) + +// 测试用例 +test("Gitlab Note", async () => { + const summarizedMr = `增加了两个新的模型图标（CVLM和MICV），并将它们添加到ICONS对象中。合并请求增加了对模型卡片的处理逻辑，调整了导入顺序，并在点击模型卡片时根据是否存在\`apiDoc\`属性决定是跳转到详情页还是打开新窗口。新增了两个模型卡片“通义千问-Max”和“通义千问-Plus”，包括其详细描述、标签、类型、更新时间和API文档链接。` + const summarizedComment = ` + # 整体摘要： + ${summarizedMr} + + # 文件变更： + | 文件路径 | 变更摘要 | + | --- | --- | + | src/components/ModelCard/index.tsx | 新增模型卡片“通义千问-Max”和“通义千问-Plus”，包括其详细描述、标签、类型、更新时间和API文档链接。 | + | src/components/ModelCard/index.less | 新增模型卡片“通义千问-Max”和“通义千问-Plus”的样式。 | + | src/components/ModelCard/icons.ts | 增加了两个新的模型图标（CVLM和MICV），并将它们添加到ICONS对象中。 | + ` + + const loadingComment = "小煎蛋正在处理您的合并请求，请稍等片刻。" + + const project_id = 139032 + const merge_request_iid = 488 + + const { id } = await service.gitlab.note.create2Mr( + project_id, + merge_request_iid, + loadingComment + ) + + await sleep(5000) + + await service.gitlab.note.modify2Mr( + project_id, + merge_request_iid, + id, + summarizedComment + ) +}, 10000) diff --git a/types/gitlab.ts b/types/gitlab.ts index 6535915..8460e96 100644 --- a/types/gitlab.ts +++ b/types/gitlab.ts @@ -347,4 +347,42 @@ export namespace Gitlab { */ web_url: string } + + /* 合并请求事件 */ + export interface MergeRequestEvent { + /** + * 事件对象类型 + */ + object_kind: "merge_request" + /** + * 事件类型 + */ + event_type: "merge_request" + /** + * 项目信息 + */ + project: { + /** + * 项目ID + */ + id: number + } + /** + * 合并请求的属性 + */ + object_attributes: { + /** + * 合并请求的内部ID + */ + iid: number + /** + * 合并请求的状态 + */ + state: "opened" | "closed" | "reopened" | "merged" + /** + * 合并请求的变更信息 + */ + changes?: any + } + } } diff --git a/utils/chatTools.ts b/utils/chatTools.ts new file mode 100644 index 0000000..b90c0af --- /dev/null +++ b/utils/chatTools.ts @@ -0,0 +1,32 @@ +import { ChatOpenAI } from "@langchain/openai" + +/** + * 获取Deepseek模型 + * @param {number} temperature - 温度参数，用于控制生成文本的随机性。 + * @returns {Promise} 返回一个包含Deepseek模型实例的Promise。 + */ +const getDeepseekModel = async (temperature: number) => { + const model = "deepseek-coder" + const apiKey = "sk-21a2ce1c2ee94bc2933798eac1bbcadc" + const baseURL = "https://api.deepseek.com" + return new ChatOpenAI({ apiKey, temperature, model }, { baseURL }) +} + +/** + * 获取GPT-4o模型 + * @param {number} temperature - 温度参数，用于控制生成文本的随机性。 + * @returns {Promise} 返回一个包含GPT-4o模型实例的Promise。 + */ +const getGpt4oModel = async (temperature: number) => { + const model = "deepseek-coder" + const apiKey = "sk-EhbBTR0QjhH22iLr9aCb04D2B0F44f88A07c2924Eb54CfA4" + const baseURL = "https://api.gpt.ge/v1" + return new ChatOpenAI({ apiKey, temperature, model }, { baseURL }) +} + +const chatTools = { + getDeepseekModel, + getGpt4oModel, +} + +export default chatTools diff --git a/utils/pathTools.ts b/utils/pathTools.ts index 144a754..1d68283 100644 --- a/utils/pathTools.ts +++ b/utils/pathTools.ts @@ -30,3 +30,22 @@ export const makeCheckPathTool = (url: string, prefix?: string) => { fullCheck: (path: string) => pathname === path, } } + +/** + * 裁剪路径字符串，如果路径长度超过20个字符，则只保留最后两级目录。 + * + * @param {string} path - 要处理的路径字符串。 + * @returns {string} - 裁剪后的路径字符串，如果长度不超过20个字符则返回原路径。 + */ +export const shortenPath = (path: string): string => { + if (path.length <= 20) { + return path + } + + const parts = path.split("/") + if (parts.length <= 2) { + return path + } + + return `.../${parts[parts.length - 2]}/${parts[parts.length - 1]}` +} diff --git a/utils/tokenTools.ts b/utils/tokenTools.ts new file mode 100644 index 0000000..8350aaa --- /dev/null +++ b/utils/tokenTools.ts @@ -0,0 +1,19 @@ +import { get_encoding as getEncoding } from "@dqbd/tiktoken" + +const tokenizer = getEncoding("cl100k_base") + +const encode = (input: string): Uint32Array => { + return tokenizer.encode(input) +} + +const getTokenCount = (input: string): number => { + const cleanedInput = input.replace(/<\|endoftext\|>/g, "") + return encode(cleanedInput).length +} + +const tokenTools = { + getTokenCount, + encode, +} + +export default tokenTools