@comate/zulu 0.7.4-beta.1 → 0.7.4

package/comate-engine/plugins/aiscan/dist/index.js

@@ -44491,6 +44491,7 @@ const RESULT_TIMEOUT_TIMR = 5 * 60 * 1000;
 const REPAIR_STATUS_URL = 'https://uflow.baidu-int.com/workflow/api/flow/v1/trigger-webhook/985e90acabd0416392ddf8f3c69b0869';
 const REPAIR_PROMPT_URL = 'http://uflow.baidu-int.com/workflow/api/flow/v1/trigger-webhook/0b4aff3e4e614fec902f80f8c2414d5b';
 const GET_CODE_REQUIRE = 'https://uflow.baidu-int.com/workflow/api/flow/v1/trigger-webhook/de514c00d3ca438581940f0bb0bb1f3c';
+const REPAIR_LINE_URL = 'https://uflow.baidu-int.com/workflow/api/flow/v1/trigger-webhook/c8e8077c9fe340ea9240dff7b0976cbe';
 
 // @ts-expect-error ESM兼容
 class BosUtil {
@@ -51670,6 +51671,41 @@ async function getJobBuildId(realUserName, module, branch) {
     return result.data;
 }
 
+// 默认语言推荐文件修复长度映射
+const DEFAULT_LANGUAGE_RECOMMEND_LENGTH_MAP = {
+    'PYTHON': 200,
+    'JAVA': 500,
+    'GO': 300,
+    'JS': 300,
+    'OTHER': 300
+};
+// 获取语言推荐文件修复长度映射
+async function getLanguageRecommendedLengthMap() {
+    try {
+        const response = await fetch(REPAIR_LINE_URL, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        });
+        if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+        }
+        const result = await response.json();
+        // 假设接口返回的数据格式与 DEFAULT_LANGUAGE_RECOMMEND_LENGTH_MAP 相同
+        // 如果接口返回格式不同，需要根据实际情况调整
+        if (result.data && typeof result.data === 'object') {
+            console.log('22222222222@@@@2222222222');
+            console.log(JSON.stringify(result.data));
+            return result.data;
+        }
+        // 如果接口返回格式不符合预期，使用默认值
+        return DEFAULT_LANGUAGE_RECOMMEND_LENGTH_MAP;
+    } catch (error) {
+        console.log('获取语言推荐长度映射失败:', error);
+        return DEFAULT_LANGUAGE_RECOMMEND_LENGTH_MAP;
+    }
+}
 function removeFirstAndLastLines(content) {
     // 按行分割字符串
     const lines = content.split(/\r?\n/);
@@ -51682,10 +51718,51 @@ function removeFirstAndLastLines(content) {
     // 重新组合为字符串
     return remainingLines.join('\n');
 }
-function processBugListAndFile(bugList, fileContent) {
+async function processBugListAndFile(bugList, fileContent) {
     // 将文件内容按行分割成数组
     const fileLines = fileContent.split('\n');
     const totalFileLines = fileLines.length;
+    // 判断文件语言类型
+    let languageType = 'OTHER';
+    const filename = bugList[0]?.file_path || '';
+    const extension = filename.split('.').pop()?.toLowerCase();
+    if (extension === 'py') {
+        languageType = 'PYTHON';
+    } else if (extension === 'java') {
+        languageType = 'JAVA';
+    } else if (extension === 'go') {
+        languageType = 'GO';
+    } else if ([
+        'js',
+        'jsx',
+        'ts',
+        'tsx',
+        'vue'
+    ].includes(extension || '')) {
+        languageType = 'JS';
+    }
+    // 获取语言推荐长度映射
+    const languageLengthMap = await getLanguageRecommendedLengthMap();
+    const recommendLength = languageLengthMap[languageType] || 300;
+    // 如果文件长度不超过推荐长度，直接返回原格式
+    if (totalFileLines <= recommendLength) {
+        const adjustedBugList = bugList.map((bug)=>({
+                line_number: bug.line_number,
+                description: bug.description
+            }));
+        return {
+            fileline: fileContent,
+            needRepairLine: fileContent,
+            frontFile: '',
+            backFile: '',
+            minBugLine: bugList[0]?.line_number || 1,
+            maxBugLine: bugList[bugList.length - 1]?.line_number || 1,
+            startLine: 1,
+            endLine: totalFileLines,
+            bugList: adjustedBugList,
+            totalFileLines
+        };
+    }
     // 1. 获取最小和最大行号
     let minBugLine = Infinity;
     let maxBugLine = -Infinity;
@@ -51706,7 +51783,6 @@ function processBugListAndFile(bugList, fileContent) {
         endLine = Math.min(totalFileLines, maxBugLine + 10);
     }
     // 3. 截取文件内容
-    // 4. 如果 startLine != 1，在开头添加提示行
     const extractedLines = fileLines.slice(startLine - 1, endLine);
     let fileline;
     let needRepairLine;
@@ -51726,9 +51802,8 @@ function processBugListAndFile(bugList, fileContent) {
     const adjustedBugList = bugList.map((bug)=>({
             ...bug,
             line_number: startLine === 1 ? bug.line_number - startLine + 1 // 无额外行，正常偏移
-             : bug.line_number - startLine + 2
+             : bug.line_number - startLine + 2 // 有额外行，额外 +1
         }));
-    console.log(adjustedBugList);
     const simpleBugList = adjustedBugList.map((item)=>({
             line_number: item.line_number,
             description: item.description
@@ -51756,6 +51831,49 @@ function removeFirstLineIfMarker(fileline) {
     }
     return fileline; // 如果不是，原样返回
 }
+async function processBugListInBatches(fileContent, languageType, originalBugList) {
+    // 获取语言推荐长度映射
+    const languageLengthMap = await getLanguageRecommendedLengthMap();
+    const recommendedLength = languageLengthMap[languageType] || 300;
+    console.log(`Recommended length for ${languageType}: ${recommendedLength}`);
+    // 将文件内容按行分割
+    const fileLines = fileContent.split('\n');
+    const totalLines = fileLines.length;
+    // 如果总行数小于等于推荐长度，直接返回
+    if (totalLines <= recommendedLength) {
+        return [
+            {
+                bugList: originalBugList.map((bug)=>({
+                        ...bug,
+                        line_number: bug.line_number
+                    })),
+                needRepairLine: fileContent
+            }
+        ];
+    }
+    // 按推荐长度分块
+    const batches = [];
+    let startIdx = 0;
+    while(startIdx < totalLines){
+        const endIdx = Math.min(startIdx + recommendedLength, totalLines);
+        const batchContent = fileLines.slice(startIdx, endIdx).join('\n');
+        // 计算当前批次中涉及的 bug
+        const currentBatchBugs = originalBugList.filter((bug)=>{
+            const bugLine = bug.line_number - 1; // 转换为0基准索引
+            return bugLine >= startIdx && bugLine < endIdx;
+        }).map((bug)=>({
+                ...bug,
+                line_number: bug.line_number - startIdx + 1
+            }));
+        batches.push({
+            bugList: currentBatchBugs,
+            needRepairLine: batchContent
+        });
+        startIdx = endIdx;
+    }
+    console.log(JSON.stringify(batches));
+    return batches;
+}
 async function getPromptText(filename, runtype = 'aiscan') {
     try {
         const response = await fetch(REPAIR_PROMPT_URL, {
@@ -51768,6 +51886,8 @@ async function getPromptText(filename, runtype = 'aiscan') {
             throw new Error(`HTTP error! status: ${response.status}`);
         }
         const result = await response.json();
+        let text = '';
+        let languageType = 'Other';
         // 如果 runtype 为 'icode'，增加其他语言支持
         if (runtype === 'icode') {
             const languageInfoMap = new Map([
@@ -51812,16 +51932,22 @@ async function getPromptText(filename, runtype = 'aiscan') {
                     }
                 ]
             ]);
+            const suffixToLanguageType = new Map();
             const suffixToDisplayString = new Map();
-            for (const [_, languageInfo] of languageInfoMap){
+            for (const [langType, languageInfo] of languageInfoMap){
                 for (const suffix of languageInfo.suffixes){
+                    suffixToLanguageType.set(suffix, langType);
                     suffixToDisplayString.set(suffix, languageInfo.displayString);
                 }
             }
             const lastDotIndex = filename.lastIndexOf('.');
-            if (lastDotIndex === -1) return result.data.Other || '';
-            const suffix = filename.slice(lastDotIndex);
-            return suffixToDisplayString.get(suffix) || result.data.Other || '';
+            if (lastDotIndex === -1) {
+                text = result.data.Other || '';
+            } else {
+                const suffix = filename.slice(lastDotIndex);
+                languageType = suffixToLanguageType.get(suffix) || 'Other';
+                text = suffixToDisplayString.get(suffix) || result.data.Other || '';
+            }
         } else {
             // 原逻辑：只支持 Java 和 Python
             const languageInfoMap = new Map([
@@ -51844,20 +51970,33 @@ async function getPromptText(filename, runtype = 'aiscan') {
                     }
                 ]
             ]);
+            const suffixToLanguageType = new Map();
             const suffixToDisplayString = new Map();
-            for (const [_, languageInfo] of languageInfoMap){
+            for (const [langType, languageInfo] of languageInfoMap){
                 for (const suffix of languageInfo.suffixes){
+                    suffixToLanguageType.set(suffix, langType);
                     suffixToDisplayString.set(suffix, languageInfo.displayString);
                 }
             }
             const lastDotIndex = filename.lastIndexOf('.');
-            if (lastDotIndex === -1) return '';
-            const suffix = filename.slice(lastDotIndex);
-            return suffixToDisplayString.get(suffix) || '';
+            if (lastDotIndex === -1) {
+                text = '';
+            } else {
+                const suffix = filename.slice(lastDotIndex);
+                languageType = suffixToLanguageType.get(suffix) || 'Other';
+                text = suffixToDisplayString.get(suffix) || '';
+            }
         }
+        return {
+            text,
+            languageType
+        };
     } catch (error) {
         console.error('请求失败:', error);
-        return '';
+        return {
+            text: '',
+            languageType: 'Other'
+        };
     }
 }
 async function getRepairStatus() {
@@ -52382,7 +52521,9 @@ class codeStyleCheckProvider extends SkillProvider {
                                     repaireResultStatus = 0;
                                 }
                                 try {
-                                    let promptText = await getPromptText(filePath, 'aiscan');
+                                    let promptResult = await getPromptText(filePath, 'aiscan');
+                                    let promptText = promptResult.text;
+                                    let languageType = promptResult.languageType;
                                     if (promptText != '') {
                                         // 获取原文件内容
                                         const fileSystem = await this.requestWorkspaceFileSystem();
@@ -52391,21 +52532,41 @@ class codeStyleCheckProvider extends SkillProvider {
                                             oldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
                                         }
                                         // 截取文件内容，只保留需修复的问题，第一行前10行至，最后一个问题的后10行，其他内容不处理
-                                        const fine_fileContent = processBugListAndFile(allBugs[filePath], oldFilecontent);
+                                        const fine_fileContent = await processBugListAndFile(allBugs[filePath], oldFilecontent);
                                         // 调用大模型获取修复文件
-                                        const prompt = this.llm.createPrompt(promptText, {
-                                            'CODE_ERROR_DETAIL': JSON.stringify(fine_fileContent.bugList, null, 2),
-                                            'CODE_FILE_CONTENT': fine_fileContent.needRepairLine
-                                        });
-                                        console.info('开始修复时间:', new Date().toLocaleString());
-                                        console.info('prompt:', prompt);
                                         try {
-                                            const chunk = await this.llm.askForCode(prompt, {
-                                                model: TextModel.ErnieBot4Turbo128
-                                            });
-                                            // 按照格式渲染
-                                            const finalRepairContent = removeFirstAndLastLines(chunk);
-                                            console.info(`修复建议内容：${finalRepairContent}`);
+                                            // 将第一次切片后的 fine_fileContent 进行重复切片
+                                            const needrepairlist = await processBugListInBatches(fine_fileContent.needRepairLine, languageType, fine_fileContent.bugList);
+                                            console.log("needrepairlist==================");
+                                            console.log(JSON.stringify(needrepairlist));
+                                            let resultRepairList = [];
+                                            for (const data of needrepairlist){
+                                                try {
+                                                    const prompt = this.llm.createPrompt(promptText, {
+                                                        'CODE_ERROR_DETAIL': JSON.stringify(data.bugList, null, 2),
+                                                        'CODE_FILE_CONTENT': data.needRepairLine
+                                                    });
+                                                    console.info('开始修复时间:', new Date().toLocaleString());
+                                                    console.info('prompt:', prompt);
+                                                    const chunk = await this.llm.askForCode(prompt, {
+                                                        model: TextModel.ErnieBot4Turbo128
+                                                    });
+                                                    // 按照格式渲染
+                                                    const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                    console.info(`修复建议内容：${finalRepairContent}`);
+                                                    if (chunk != '') {
+                                                        // 循环调用模型，如果当前段失败，则取调用模型前的代码块进行拼接
+                                                        resultRepairList.push(finalRepairContent);
+                                                    } else {
+                                                        resultRepairList.push(data.needRepairLine);
+                                                    }
+                                                } catch (error) {
+                                                    console.error(`修复失败：${error.message}`);
+                                                    resultRepairList.push(data.needRepairLine);
+                                                }
+                                            }
+                                            // 合并所有修复结果的代码块
+                                            const finalRepairContent = resultRepairList.join('\n');
                                             let nowOldFilecontent = '';
                                             if (fileSystem) {
                                                 nowOldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
@@ -53332,7 +53493,9 @@ class iscanResultProvider extends SkillProvider {
                                             repaireResultStatus = 0;
                                         }
                                         try {
-                                            let promptText = await getPromptText(filePath, 'aiscan');
+                                            let promptResult = await getPromptText(filePath, 'aiscan');
+                                            let promptText = promptResult.text;
+                                            let languageType = promptResult.languageType;
                                             if (promptText != '') {
                                                 // 获取原文件内容
                                                 const fileSystem = await this.requestWorkspaceFileSystem();
@@ -53341,21 +53504,44 @@ class iscanResultProvider extends SkillProvider {
                                                     oldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
                                                 }
                                                 // 截取文件内容，只保留需修复的问题，第一行前10行至，最后一个问题的后10行，其他内容不处理
-                                                const fine_fileContent = processBugListAndFile(allBugs[filePath], oldFilecontent);
+                                                const fine_fileContent = await processBugListAndFile(allBugs[filePath], oldFilecontent);
                                                 // 调用大模型获取修复文件
-                                                const prompt = this.llm.createPrompt(promptText, {
-                                                    'CODE_ERROR_DETAIL': JSON.stringify(fine_fileContent.bugList, null, 2),
-                                                    'CODE_FILE_CONTENT': fine_fileContent.needRepairLine
-                                                });
-                                                console.info('开始修复时间:', new Date().toLocaleString());
-                                                console.info('prompt:', prompt);
                                                 try {
-                                                    const chunk = await this.llm.askForCode(prompt, {
-                                                        model: TextModel.ErnieBot4Turbo128
-                                                    });
-                                                    // 按照格式渲染
-                                                    const finalRepairContent = removeFirstAndLastLines(chunk);
-                                                    console.info(`修复建议内容：${finalRepairContent}`);
+                                                    // 将第一次切片后的 fine_fileContent 进行重复切片
+                                                    const needrepairlist = await processBugListInBatches(fine_fileContent.needRepairLine, languageType, fine_fileContent.bugList);
+                                                    console.log("needrepairlist==================");
+                                                    console.log(JSON.stringify(needrepairlist));
+                                                    let resultRepairList = [];
+                                                    for (const data of needrepairlist){
+                                                        try {
+                                                            console.log('running--------------');
+                                                            console.log(JSON.stringify(data.bugList, null, 2));
+                                                            console.log(data.needRepairLine);
+                                                            const prompt = this.llm.createPrompt(promptText, {
+                                                                'CODE_ERROR_DETAIL': JSON.stringify(data.bugList, null, 2),
+                                                                'CODE_FILE_CONTENT': data.needRepairLine
+                                                            });
+                                                            console.info('开始修复时间:', new Date().toLocaleString());
+                                                            console.info('prompt:', prompt);
+                                                            const chunk = await this.llm.askForCode(prompt, {
+                                                                model: TextModel.ErnieBot4Turbo128
+                                                            });
+                                                            // 按照格式渲染
+                                                            const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                            console.info(`修复建议内容：${finalRepairContent}`);
+                                                            if (chunk != '') {
+                                                                // 循环调用模型，如果当前段失败，则取调用模型前的代码块进行拼接
+                                                                resultRepairList.push(finalRepairContent);
+                                                            } else {
+                                                                resultRepairList.push(data.needRepairLine);
+                                                            }
+                                                        } catch (error) {
+                                                            console.info(`修复失败：${error.message}`);
+                                                            resultRepairList.push(data.needRepairLine);
+                                                        }
+                                                    }
+                                                    // 合并所有修复结果的代码块
+                                                    const finalRepairContent = resultRepairList.join('\n');
                                                     let nowOldFilecontent = '';
                                                     if (fileSystem) {
                                                         nowOldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
@@ -53832,29 +54018,52 @@ class checkResultByIdProvider extends SkillProvider {
                                         repaireResultStatus = 0;
                                     }
                                     try {
-                                        // 获取原文件内容
-                                        let promptText = await getPromptText(filePath, 'icode');
-                                        if (promptText !== '') {
-                                            // 展示修复loading
+                                        let promptResult = await getPromptText(filePath, 'aiscan');
+                                        let promptText = promptResult.text;
+                                        let languageType = promptResult.languageType;
+                                        if (promptText != '') {
+                                            // 获取原文件内容
                                             const fileSystem = await this.requestWorkspaceFileSystem();
                                             let oldFilecontent = '';
                                             if (fileSystem) {
                                                 oldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
                                             }
                                             // 截取文件内容，只保留需修复的问题，第一行前10行至，最后一个问题的后10行，其他内容不处理
-                                            const fine_fileContent = processBugListAndFile(bugsDetail, oldFilecontent);
-                                            console.log('filePath:', filePath, 'bugsDetail:', fine_fileContent);
+                                            const fine_fileContent = await processBugListAndFile(bugsDetail, oldFilecontent);
                                             // 调用大模型获取修复文件
                                             try {
-                                                const prompt = this.llm.createPrompt(promptText, {
-                                                    'CODE_ERROR_DETAIL': JSON.stringify(fine_fileContent.bugList, null, 2),
-                                                    'CODE_FILE_CONTENT': fine_fileContent.needRepairLine
-                                                });
-                                                const chunk = await this.llm.askForCode(prompt, {
-                                                    model: TextModel.ErnieBot4Turbo128
-                                                });
-                                                // 按照格式渲染
-                                                const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                // 将第一次切片后的 fine_fileContent 进行重复切片
+                                                const needrepairlist = await processBugListInBatches(fine_fileContent.needRepairLine, languageType, fine_fileContent.bugList);
+                                                console.log("needrepairlist==================");
+                                                console.log(JSON.stringify(needrepairlist));
+                                                let resultRepairList = [];
+                                                for (const data of needrepairlist){
+                                                    try {
+                                                        const prompt = this.llm.createPrompt(promptText, {
+                                                            'CODE_ERROR_DETAIL': JSON.stringify(data.bugList, null, 2),
+                                                            'CODE_FILE_CONTENT': data.needRepairLine
+                                                        });
+                                                        console.info('开始修复时间:', new Date().toLocaleString());
+                                                        console.info('prompt:', prompt);
+                                                        const chunk = await this.llm.askForCode(prompt, {
+                                                            model: TextModel.ErnieBot4Turbo128
+                                                        });
+                                                        // 按照格式渲染
+                                                        const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                        console.info(`修复建议内容：${finalRepairContent}`);
+                                                        if (chunk != '') {
+                                                            // 循环调用模型，如果当前段失败，则取调用模型前的代码块进行拼接
+                                                            resultRepairList.push(finalRepairContent);
+                                                        } else {
+                                                            resultRepairList.push(data.needRepairLine);
+                                                        }
+                                                    } catch (error) {
+                                                        console.error(`修复失败：${error.message}`);
+                                                        resultRepairList.push(data.needRepairLine);
+                                                    }
+                                                }
+                                                // 合并所有修复结果的代码块
+                                                const finalRepairContent = resultRepairList.join('\n');
                                                 let nowOldFilecontent = '';
                                                 if (fileSystem) {
                                                     nowOldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
@@ -54198,30 +54407,52 @@ class checkResultByIdProvider extends SkillProvider {
                                             repaireResultStatus = 0;
                                         }
                                         try {
-                                            // 获取原文件内容
-                                            let promptText = await getPromptText(filePath, 'icode');
-                                            if (promptText !== '') {
-                                                // 展示修复loading
+                                            let promptResult = await getPromptText(filePath, 'aiscan');
+                                            let promptText = promptResult.text;
+                                            let languageType = promptResult.languageType;
+                                            if (promptText != '') {
+                                                // 获取原文件内容
                                                 const fileSystem = await this.requestWorkspaceFileSystem();
                                                 let oldFilecontent = '';
                                                 if (fileSystem) {
                                                     oldFilecontent = await fileSystem.readFile(filePath, 'utf-8');
                                                 }
                                                 // 截取文件内容，只保留需修复的问题，第一行前10行至，最后一个问题的后10行，其他内容不处理
-                                                const fine_fileContent = processBugListAndFile(bugsDetail, oldFilecontent);
-                                                console.log('filePath:', filePath, 'bugsDetail:', fine_fileContent);
+                                                const fine_fileContent = await processBugListAndFile(bugsDetail, oldFilecontent);
                                                 // 调用大模型获取修复文件
-                                                const prompt = this.llm.createPrompt(promptText, {
-                                                    'CODE_ERROR_DETAIL': JSON.stringify(fine_fileContent.bugList, null, 2),
-                                                    'CODE_FILE_CONTENT': fine_fileContent.needRepairLine
-                                                });
-                                                console.log('prompt:', prompt);
                                                 try {
-                                                    const chunk = await this.llm.askForCode(prompt, {
-                                                        model: TextModel.ErnieBot4Turbo128
-                                                    });
-                                                    // 按照格式渲染
-                                                    const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                    // 将第一次切片后的 fine_fileContent 进行重复切片
+                                                    const needrepairlist = await processBugListInBatches(fine_fileContent.needRepairLine, languageType, fine_fileContent.bugList);
+                                                    console.log("needrepairlist==================");
+                                                    console.log(JSON.stringify(needrepairlist));
+                                                    let resultRepairList = [];
+                                                    for (const data of needrepairlist){
+                                                        try {
+                                                            const prompt = this.llm.createPrompt(promptText, {
+                                                                'CODE_ERROR_DETAIL': JSON.stringify(data.bugList, null, 2),
+                                                                'CODE_FILE_CONTENT': data.needRepairLine
+                                                            });
+                                                            console.info('开始修复时间:', new Date().toLocaleString());
+                                                            console.info('prompt:', prompt);
+                                                            const chunk = await this.llm.askForCode(prompt, {
+                                                                model: TextModel.ErnieBot4Turbo128
+                                                            });
+                                                            // 按照格式渲染
+                                                            const finalRepairContent = removeFirstAndLastLines(chunk);
+                                                            console.info(`修复建议内容：${finalRepairContent}`);
+                                                            if (chunk != '') {
+                                                                // 循环调用模型，如果当前段失败，则取调用模型前的代码块进行拼接
+                                                                resultRepairList.push(finalRepairContent);
+                                                            } else {
+                                                                resultRepairList.push(data.needRepairLine);
+                                                            }
+                                                        } catch (error) {
+                                                            console.error(`修复失败：${error.message}`);
+                                                            resultRepairList.push(data.needRepairLine);
+                                                        }
+                                                    }
+                                                    // 合并所有修复结果的代码块
+                                                    const finalRepairContent = resultRepairList.join('\n');
                                                     let nowOldFilecontent = '';
                                                     if (fileSystem) {
                                                         nowOldFilecontent = await fileSystem.readFile(filePath, 'utf-8');