doomiaichat 4.7.0 → 4.8.0

package/dist/openai.d.ts

@@ -82,7 +82,7 @@ export default class OpenAIGpt extends GptBase {
      * @param {*} messages
      * @returns
      */
-    protected pickUpFaqContent(messages: Array<any>): Array<FaqItem>;
+    protected pickUpFaqContent(messages: Array<any>): Promise<Array<FaqItem>>;
     /**
      * 从指定的文本内容中生成一张试卷
      * @param {*} content
@@ -97,7 +97,7 @@ export default class OpenAIGpt extends GptBase {
      * @param {*} result
      *
      */
-    protected pickUpQuestions(result: Array<any>, count: number, questiontype: string, score?: number): Array<QuestionItem>;
+    protected pickUpQuestions(result: Array<any>, count: number, questiontype: string, score?: number): Promise<Array<QuestionItem>>;
     /**
      * 验证JSON字符串是否是真正可转换为JSON的合法格式
      * 这里只能做一个最简单的处理，就是用两端的符号

package/dist/openai.js

@@ -69,6 +69,15 @@ const QUESTION_PROMPT = {
     trueorfalse: '根据以下内容,请生成@ITEMCOUNT@道判断题,每道题正确和错误两个选项，输出结果必须是JSON数组并按照[{"question":"","choice":["A.正确","B.错误"],"answer":[]}]的结构输出',
     completion: '根据以下内容,请生成@ITEMCOUNT@道填空题和对应答案,输出结果必须是JSON数组并按照[{"question":"","answer":["填空答案1","填空答案2"]}]的结构输出'
 };
+/**
+ * 问题生成的Prompt
+ */
+const QUESTION_PROMPT_FIXED = {
+    singlechoice: '[{"question":"","choice":[],"answer":[]}]',
+    multiplechoice: '[{"question":"","choice":[],"answer":[]}]',
+    trueorfalse: '[{"question":"","choice":["A.正确","B.错误"],"answer":[]}]',
+    completion: '[{"question":"","answer":["填空答案1","填空答案2"]}]'
+};
 const QUESTION_TYPE = ['singlechoice', 'multiplechoice', 'trueorfalse', 'completion'];
 class OpenAIGpt extends gptbase_1.default {
     /**
@@ -137,6 +146,12 @@ class OpenAIGpt extends gptbase_1.default {
                     max_tokens: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.maxtoken) || this.maxtoken),
                     n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1
                 }, axiosOption);
+                // console.log('finish_reason==>', response.data.choices)
+                ////输出的内容不合规
+                if (response.data.choices[0].finish_reason === 'content_filter') {
+                    console.log('content_filter');
+                    return { successed: false, error: 'content filter' };
+                }
                 return { successed: true, message: response.data.choices, usage: response.data.usage };
             }
             catch (error) {
@@ -388,6 +403,7 @@ class OpenAIGpt extends gptbase_1.default {
                     { role: 'user', content: arrContent.slice(0, 1)[0]
                     }
                 ];
+                console.log('Faq Question Pick Prompt:', subarray);
                 //subarray.push({ role: 'user', content:'请根据上述内容,给出一道提问与答案以及答案关键词，按照先问题内容，再标准答案，再关键词的顺序输出,关键词之间用、分开'})
                 //subarray.unshift({ role: 'system', content: `你是一位专业培训师,从以下内容中提取${itemCount}条提问及答案，并从答案内容提取出至少2个关键词，最终结果按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的JSON数组结构输出。` })
                 // subarray.unshift({role: 'system', content: FAQ_ROLE_DEFINE});
@@ -396,7 +412,7 @@ class OpenAIGpt extends gptbase_1.default {
                 let result = yield this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
                 if (result.successed && result.message) {
                     // console.log('result is ', result.message[0].message.content)
-                    let msgs = this.pickUpFaqContent(result.message);
+                    let msgs = yield this.pickUpFaqContent(result.message);
                     if (msgs.length) {
                         ///对外发送检出问答题的信号
                         this.emit('parseout', { type: 'qa', items: msgs });
@@ -420,32 +436,47 @@ class OpenAIGpt extends gptbase_1.default {
      */
     pickUpFaqContent(messages) {
         var _a, _b;
-        if (!((_b = (_a = messages[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
-            return [];
-        let answerString = messages[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
-        let jsonObj = this.fixedJsonString(answerString);
-        if (!jsonObj.length)
-            return [];
-        try {
-            //let jsonObj = JSON.parse(answerString);
-            //let jsonObj = eval(answerString);
-            jsonObj.map((item) => {
-                let realKeyword = [];
-                let keywords = (item.keywords + '').split(',');
-                let answer = item.answer || '';
-                for (const k of keywords) {
-                    if (k && answer.indexOf(k) >= 0)
-                        realKeyword.push(k);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!((_b = (_a = messages[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
+                return [];
+            let answerString = messages[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+            let jsonObj = this.fixedJsonString(answerString);
+            if (!jsonObj.length) {
+                let fixedAsk = [
+                    { role: 'system', content: '角色扮演：假设你是一位高级JSON数据分析师' },
+                    { role: 'user', content: `请分析以下内容，严格按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的标准JSON数组结构输出。` },
+                    { role: 'user', content: answerString },
+                ];
+                console.log('pickUpFaqContent fixedAsk', fixedAsk);
+                let fixedJsonResult = yield this.chatRequest(fixedAsk, { replyCounts: 1 }, {});
+                if (fixedJsonResult.successed) {
+                    answerString = fixedJsonResult.message[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+                    jsonObj = this.fixedJsonString(answerString);
                 }
-                item.keywords = realKeyword;
-                return item;
-            });
-            return jsonObj;
-        }
-        catch (err) {
-            console.log('JSON error', err);
-            return [];
-        }
+                if (!jsonObj.length)
+                    return [];
+            }
+            try {
+                //let jsonObj = JSON.parse(answerString);
+                //let jsonObj = eval(answerString);
+                jsonObj.map((item) => {
+                    let realKeyword = [];
+                    let keywords = (item.keywords + '').split(',');
+                    let answer = item.answer || '';
+                    for (const k of keywords) {
+                        if (k && answer.indexOf(k) >= 0)
+                            realKeyword.push(k);
+                    }
+                    item.keywords = realKeyword;
+                    return item;
+                });
+                return jsonObj;
+            }
+            catch (err) {
+                console.log('JSON error', err);
+                return [];
+            }
+        });
     }
     /**
      * 从指定的文本内容中生成一张试卷
@@ -508,7 +539,7 @@ class OpenAIGpt extends gptbase_1.default {
                         console.log('subarray returned', result.successed);
                         if (result.successed && result.message) {
                             //console.log('paper result', key, result.message.length)
-                            let pickedQuestions = this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
+                            let pickedQuestions = yield this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
                             if (pickedQuestions.length) {
                                 ///对外发送检出题目的信号
                                 this.emit('parseout', { type: 'question', name: key, items: pickedQuestions });
@@ -537,76 +568,92 @@ class OpenAIGpt extends gptbase_1.default {
      */
     pickUpQuestions(result, count, questiontype, score = 1) {
         var _a, _b;
-        if (!((_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
-            return [];
-        let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
-        let jsonObj = this.fixedJsonString(answerString);
-        if (!jsonObj.length)
-            return [];
-        let returnItems = [];
-        try {
-            // let jsonObj = JSON.parse(answerString);
-            returnItems = jsonObj.map((questionitem) => {
-                console.log('answer item from jsonObj', questionitem);
-                if (questionitem.choice && Array.isArray(questionitem.choice) && questiontype != 'completion') {
-                    questionitem.fullanswer = (questionitem.answer + '').replace(/,|[^ABCDE]/g, '');
-                    questionitem.score = score;
-                    if (questionitem.choice) {
-                        questionitem.choice = questionitem.choice.map((item, index) => {
-                            let seqNo = 'ABCDEFG'[index]; //String.fromCharCode(65 + index);
-                            let correctReg = new RegExp(`${seqNo}.|${seqNo}`, 'ig');
-                            // console.log('itemitemitem', item)
-                            //let answer = jsonObj.fullanswer
-                            return {
-                                id: seqNo,
-                                content: (item + '').replace(correctReg, '').trim(),
-                                iscorrect: (questionitem.fullanswer || '').indexOf(seqNo) >= 0 ? 1 : 0
-                                //|| jsonObj.fullanswer.indexOf(m))
-                            };
-                        });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!((_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
+                return [];
+            let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+            let jsonObj = this.fixedJsonString(answerString);
+            ////修复的结果无法用程序修复，请求GPT来分析修复一下这个结果
+            if (!jsonObj.length) {
+                let fixedAsk = [
+                    { role: 'system', content: '角色扮演：假设你是一位高级JSON数据分析师' },
+                    { role: 'user', content: `请分析以下内容，严格按照${QUESTION_PROMPT_FIXED[questiontype]}的标准JSON数组结构输出。` },
+                    { role: 'user', content: answerString },
+                ];
+                console.log('fixedAsk', fixedAsk);
+                let fixedJsonResult = yield this.chatRequest(fixedAsk, { replyCounts: 1 }, {});
+                if (fixedJsonResult.successed) {
+                    answerString = fixedJsonResult.message[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+                    jsonObj = this.fixedJsonString(answerString);
+                }
+                if (!jsonObj.length)
+                    return [];
+            }
+            let returnItems = [];
+            try {
+                // let jsonObj = JSON.parse(answerString);
+                returnItems = jsonObj.map((questionitem) => {
+                    console.log('answer item from jsonObj', questionitem);
+                    if (questionitem.choice && Array.isArray(questionitem.choice) && questiontype != 'completion') {
+                        questionitem.fullanswer = (questionitem.answer + '').replace(/,|[^ABCDE]/g, '');
+                        questionitem.score = score;
+                        if (questionitem.choice) {
+                            questionitem.choice = questionitem.choice.map((item, index) => {
+                                let seqNo = 'ABCDEFG'[index]; //String.fromCharCode(65 + index);
+                                let correctReg = new RegExp(`${seqNo}.|${seqNo}`, 'ig');
+                                // console.log('itemitemitem', item)
+                                //let answer = jsonObj.fullanswer
+                                return {
+                                    id: seqNo,
+                                    content: (item + '').replace(correctReg, '').trim(),
+                                    iscorrect: (questionitem.fullanswer || '').indexOf(seqNo) >= 0 ? 1 : 0
+                                    //|| jsonObj.fullanswer.indexOf(m))
+                                };
+                            });
+                        }
+                        ///如果是非判断题，题目的选项数量小于2 ，则无效
+                        ///如果是判断题，题目的选项必须=2
+                        if (!questionitem.choice || (questiontype != 'trueorfalse' && questionitem.choice.length < 3) || (questiontype == 'trueorfalse' && questionitem.choice.length != 2)) {
+                            return null;
+                        }
                     }
-                    ///如果是非判断题，题目的选项数量小于2 ，则无效
-                    ///如果是判断题，题目的选项必须=2
-                    if (!questionitem.choice || (questiontype != 'trueorfalse' && questionitem.choice.length < 3) || (questiontype == 'trueorfalse' && questionitem.choice.length != 2)) {
-                        return null;
+                    switch (questiontype) {
+                        case 'singlechoice':
+                            questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('').slice(0, 1);
+                            break;
+                        case 'multiplechoice':
+                            questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
+                            break;
+                        case 'trueorfalse':
+                            let rightItem = questionitem.choice.find((x) => { return x.iscorrect == 1; });
+                            questionitem.answer = [(rightItem === null || rightItem === void 0 ? void 0 : rightItem.id) || 'Z']; //[(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
+                            break;
                     }
-                }
-                switch (questiontype) {
-                    case 'singlechoice':
-                        questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('').slice(0, 1);
-                        break;
-                    case 'multiplechoice':
-                        questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
-                        break;
-                    case 'trueorfalse':
-                        let rightItem = questionitem.choice.find((x) => { return x.iscorrect == 1; });
-                        questionitem.answer = [(rightItem === null || rightItem === void 0 ? void 0 : rightItem.id) || 'Z']; //[(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
-                        break;
-                }
-                ///单选题验证
-                if (questiontype == 'singlechoice') {
-                    let rightAnswer = questionitem.choice ? questionitem.choice.filter((item) => { return item.iscorrect === 1; }) : [];
-                    ///单选题的正确选项大于了1个
-                    if (rightAnswer.length != 1 || !questionitem.answer || questionitem.answer.length !== 1)
-                        return null;
-                    ///正确选项和答案不一致
-                    if (rightAnswer[0].id.toUpperCase() != (questionitem.answer[0] || '').toUpperCase())
-                        return null;
-                }
-                ///多选题验证
-                if (questiontype == 'multiplechoice') {
-                    let rightAnswer = questionitem.choice ? questionitem.choice.filter((item) => { return item.iscorrect === 1; }) : [];
-                    ///单选题的正确选项大于了1个
-                    if (rightAnswer.length === 0 || !questionitem.answer || questionitem.answer.length === 0)
-                        return null;
-                }
-                return questionitem;
-            });
-        }
-        catch (err) {
-            console.log('error happened:', err);
-        }
-        return returnItems.filter(i => { return i != null; }).slice(0, count);
+                    ///单选题验证
+                    if (questiontype == 'singlechoice') {
+                        let rightAnswer = questionitem.choice ? questionitem.choice.filter((item) => { return item.iscorrect === 1; }) : [];
+                        ///单选题的正确选项大于了1个
+                        if (rightAnswer.length != 1 || !questionitem.answer || questionitem.answer.length !== 1)
+                            return null;
+                        ///正确选项和答案不一致
+                        if (rightAnswer[0].id.toUpperCase() != (questionitem.answer[0] || '').toUpperCase())
+                            return null;
+                    }
+                    ///多选题验证
+                    if (questiontype == 'multiplechoice') {
+                        let rightAnswer = questionitem.choice ? questionitem.choice.filter((item) => { return item.iscorrect === 1; }) : [];
+                        ///单选题的正确选项大于了1个
+                        if (rightAnswer.length === 0 || !questionitem.answer || questionitem.answer.length === 0)
+                            return null;
+                    }
+                    return questionitem;
+                });
+            }
+            catch (err) {
+                console.log('error happened:', err);
+            }
+            return returnItems.filter(i => { return i != null; }).slice(0, count);
+        });
     }
     /**
      * 验证JSON字符串是否是真正可转换为JSON的合法格式

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiaichat",
-  "version": "4.7.0",
+  "version": "4.8.0",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
   "scripts": {

package/src/openai.ts

@@ -57,6 +57,16 @@ const QUESTION_PROMPT: any ={
     trueorfalse: '根据以下内容,请生成@ITEMCOUNT@道判断题,每道题正确和错误两个选项，输出结果必须是JSON数组并按照[{"question":"","choice":["A.正确","B.错误"],"answer":[]}]的结构输出',
     completion: '根据以下内容,请生成@ITEMCOUNT@道填空题和对应答案,输出结果必须是JSON数组并按照[{"question":"","answer":["填空答案1","填空答案2"]}]的结构输出'
 }
+
+/**
+ * 问题生成的Prompt
+ */
+const QUESTION_PROMPT_FIXED: any = {
+    singlechoice: '[{"question":"","choice":[],"answer":[]}]',
+    multiplechoice: '[{"question":"","choice":[],"answer":[]}]',
+    trueorfalse: '[{"question":"","choice":["A.正确","B.错误"],"answer":[]}]',
+    completion: '[{"question":"","answer":["填空答案1","填空答案2"]}]'
+}
 const QUESTION_TYPE: string[] = ['singlechoice', 'multiplechoice', 'trueorfalse', 'completion']
 
 export default class OpenAIGpt extends GptBase {
@@ -129,6 +139,12 @@ export default class OpenAIGpt extends GptBase {
                 max_tokens: Number(callChatOption?.maxtoken || this.maxtoken),
                 n: Number(callChatOption?.replyCounts || 1) || 1
             }, axiosOption);
+            // console.log('finish_reason==>', response.data.choices)
+            ////输出的内容不合规
+            if (response.data.choices[0].finish_reason ==='content_filter') {
+                console.log('content_filter')
+                return {successed:false,error:'content filter'}
+            }
             return { successed: true, message: response.data.choices, usage: response.data.usage };
         } catch (error) {
             console.log('result is error ', error)
@@ -355,7 +371,8 @@ export default class OpenAIGpt extends GptBase {
                 { role: 'user', content: `从以下内容中提取${itemCount}条提问及答案，并从答案内容提取出至少2个关键词，最终结果按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的JSON数组结构输出。`},
                 { role: 'user', content: arrContent.slice(0, 1)[0] 
             }
-                            ] 
+            ]
+            console.log('Faq Question Pick Prompt:', subarray) 
             //subarray.push({ role: 'user', content:'请根据上述内容,给出一道提问与答案以及答案关键词，按照先问题内容，再标准答案，再关键词的顺序输出,关键词之间用、分开'})
             //subarray.unshift({ role: 'system', content: `你是一位专业培训师,从以下内容中提取${itemCount}条提问及答案，并从答案内容提取出至少2个关键词，最终结果按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的JSON数组结构输出。` })
             // subarray.unshift({role: 'system', content: FAQ_ROLE_DEFINE});
@@ -364,7 +381,7 @@ export default class OpenAIGpt extends GptBase {
             let result = await this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
             if (result.successed && result.message) {
                 // console.log('result is ', result.message[0].message.content)
-                let msgs = this.pickUpFaqContent(result.message);
+                let msgs = await this.pickUpFaqContent(result.message);
                 if (msgs.length) {
                     ///对外发送检出问答题的信号
                     this.emit('parseout', { type: 'qa', items: msgs })
@@ -388,11 +405,26 @@ export default class OpenAIGpt extends GptBase {
      * @param {*} messages 
      * @returns 
      */
-    protected pickUpFaqContent(messages: Array<any>): Array<FaqItem> {
+    protected async pickUpFaqContent(messages: Array<any>): Promise<Array<FaqItem>> {
         if (!messages[0]?.message?.content) return [];
         let answerString = messages[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
         let jsonObj = this.fixedJsonString(answerString);
-        if (!jsonObj.length) return []
+        if (!jsonObj.length){
+            let fixedAsk = [
+                { role: 'system', content: '角色扮演：假设你是一位高级JSON数据分析师' },
+                { role: 'user', content: `请分析以下内容，严格按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的标准JSON数组结构输出。` },
+                { role: 'user', content: answerString },
+            ]
+            console.log('pickUpFaqContent fixedAsk', fixedAsk)
+            let fixedJsonResult: any = await this.chatRequest(fixedAsk, { replyCounts: 1 }, {})
+            if (fixedJsonResult.successed) {
+                answerString = fixedJsonResult.message[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+                jsonObj = this.fixedJsonString(answerString);
+            }
+            if (!jsonObj.length) return []
+        }
+       
+        
         try {
             //let jsonObj = JSON.parse(answerString);
             //let jsonObj = eval(answerString);
@@ -475,7 +507,7 @@ export default class OpenAIGpt extends GptBase {
                     console.log('subarray returned', result.successed)
                     if (result.successed && result.message) {
                         //console.log('paper result', key, result.message.length)
-                        let pickedQuestions = this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
+                        let pickedQuestions = await this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
                         if (pickedQuestions.length) {
                             ///对外发送检出题目的信号
                             this.emit('parseout', { type: 'question', name: key, items: pickedQuestions })
@@ -502,11 +534,25 @@ export default class OpenAIGpt extends GptBase {
      * @param {*} result
      * 
      */
-    protected pickUpQuestions(result: Array<any>, count: number, questiontype: string, score: number = 1): Array<QuestionItem> {
+    protected async pickUpQuestions(result: Array<any>, count: number, questiontype: string, score: number = 1): Promise<Array<QuestionItem>> {
         if (!result[0]?.message?.content) return [];
         let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
         let jsonObj = this.fixedJsonString(answerString);
-        if (!jsonObj.length) return []
+        ////修复的结果无法用程序修复，请求GPT来分析修复一下这个结果
+        if (!jsonObj.length){
+            let fixedAsk = [
+                {role:'system',content:'角色扮演：假设你是一位高级JSON数据分析师'},
+                { role: 'user', content: `请分析以下内容，严格按照${QUESTION_PROMPT_FIXED[questiontype]}的标准JSON数组结构输出。` },
+                { role: 'user', content: answerString },
+            ]
+            console.log('fixedAsk', fixedAsk)
+            let fixedJsonResult:any  =await this.chatRequest(fixedAsk,{replyCounts:1},{})
+            if (fixedJsonResult.successed){
+                answerString = fixedJsonResult.message[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
+                jsonObj = this.fixedJsonString(answerString);
+            }
+            if (!jsonObj.length) return []
+        }
         let returnItems: QuestionItem[] = [];
         try {
             // let jsonObj = JSON.parse(answerString);