doomiaichat 2.0.0 → 2.2.0

package/dist/openai.js

@@ -8,9 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const openai_1 = require("openai");
-const events_1 = require("events");
+// import { EventEmitter } from "events";
+const gptbase_1 = __importDefault(require("./gptbase"));
 const SECTION_LENGTH = 1600; ///每2400个字符分成一组
 const MESSAGE_LENGTH = 1; ///每次送8句话给openai 进行解析，送多了，会报错
 //请将答案放在最后,标记为答案：()
@@ -21,7 +25,7 @@ const QUESTION_TEXT_MAPPING = {
     completion: '你是一名专业的出题老师,根据以下内容,请生成@ITEMCOUNT@道填空题和对应答案,输出结果必须是JSON数组并按照[{"question":"","answer":["填空答案1","填空答案2"]}]的结构输出' //请将答案放在最后,标记为答案：()
 };
 const QUESTION_TYPE = ['singlechoice', 'multiplechoice', 'trueorfalse', 'completion'];
-class OpenAIGpt extends events_1.EventEmitter {
+class OpenAIGpt extends gptbase_1.default {
     /**
      *
      * @param apiKey 调用OpenAI 的key
@@ -195,7 +199,7 @@ class OpenAIGpt extends events_1.EventEmitter {
                 //subarray.push({ role: 'user', content:'请根据上述内容,给出一道提问与答案以及答案关键词，按照先问题内容，再标准答案，再关键词的顺序输出,关键词之间用、分开'})
                 subarray.unshift({ role: 'system', content: `你是一位专业培训师,从以下内容中提取${itemCount}条提问及答案，并从答案内容提取出至少2个关键词，最终结果按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的JSON数组结构输出。` });
                 //subarray.unshift({ role: 'system', content: `你是一位专业程序开发工程师,根据以下内容,按照[{"question":"问题内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]JSON数组结构,给出${itemCount}条提问问题及答案以及答案关键词` })
-                console.log('subarray', subarray);
+                // console.log('subarray', subarray)
                 let result = yield this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
                 if (result.successed && result.message) {
                     // console.log('result is ', result.message[0].message.content)
@@ -213,7 +217,7 @@ class OpenAIGpt extends events_1.EventEmitter {
             arrContent = []; /// 释放内存
             ///发出信号，解析完毕
             this.emit('parseover', { type: 'qa', items: faqs });
-            return { successed: true, message: faqs };
+            return { successed: true, message: faqs.slice(0, count) };
         });
     }
     /**
@@ -433,42 +437,6 @@ class OpenAIGpt extends events_1.EventEmitter {
             console.log('error happened:', err);
         }
         return returnItems.filter(i => { return i != null; }).slice(0, count);
-        // let item = result.map(m => {
-        //     ////防止输出的JSON格式不合法
-        //     try {
-        //         let jsonObj = JSON.parse(m.message.content)
-        //         jsonObj.score = score;
-        //         if (jsonObj.choice && Array.isArray(jsonObj.choice) && questiontype != 'completion') {
-        //             jsonObj.fullanswer = (jsonObj.answer + '').replace(/,|[^ABCDE]/g, '');
-        //             jsonObj.choice = jsonObj.choice.map((item:string, index:number) => {
-        //                 let seqNo = String.fromCharCode(65 + index);
-        //                 let correctReg = new RegExp(`${seqNo}.|${seqNo}`, 'ig')
-        //                 //let answer = jsonObj.fullanswer
-        //                 return {
-        //                     id: seqNo,
-        //                     content: item.replace(correctReg, '').trim(),
-        //                     iscorrect: (jsonObj.fullanswer.indexOf(seqNo) >= 0 || jsonObj.fullanswer.indexOf(m)) >= 0 ? 1 : 0
-        //                 }
-        //             })
-        //         }
-        //         switch (questiontype) {
-        //             case 'singlechoice':
-        //                 jsonObj.answer = (jsonObj.answer + '').replace(/,|[^ABCDEFG]/g, '').split('').slice(0, 1);
-        //                 break;
-        //             case 'multiplechoice':
-        //                 jsonObj.answer = (jsonObj.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
-        //                 break;
-        //             case 'trueorfalse':
-        //                 jsonObj.answer = [(jsonObj.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
-        //                 break;
-        //         }
-        //         return jsonObj;
-        //     } catch (err) {
-        //         console.log('error happened:', err);
-        //         return null;
-        //     }
-        // })
-        // return item.filter(i => { return i != null; });
     }
     /**
      * 将一段很长的文本，按1024长度来划分到多个中

package/dist/openaiprovider.d.ts

@@ -0,0 +1,20 @@
+import { ApiCredential } from './baiduai';
+import GptBase from './gptbase';
+/**
+ * OpenAI/NLP 的服务提供商 OpenAI,微软，百度文心(待接入)，google(待接入)
+ */
+export declare const AIProviderEnum: {
+    readonly OPENAI: "openai";
+    readonly MICROSOFT: "microsoft";
+    readonly BAIDU: "baidu";
+    readonly GOOGLE: "google";
+};
+export type AIProviderEnum = typeof AIProviderEnum[keyof typeof AIProviderEnum];
+/**
+ * 根据类型创建不同的TTS引擎对象
+ * @param {*} provider
+ * @param {*} apikey
+ * @param {*} setting
+ * @returns
+ */
+export declare function createAIInstance(provider: AIProviderEnum, apikey: string | ApiCredential, setting: any): GptBase | null;

package/dist/openaiprovider.js

@@ -0,0 +1,43 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createAIInstance = exports.AIProviderEnum = void 0;
+/**
+* 语音转文字服务商工厂
+*/
+const openai_1 = __importDefault(require("./openai"));
+const azureai_1 = __importDefault(require("./azureai"));
+const baiduai_1 = __importDefault(require("./baiduai"));
+/**
+ * OpenAI/NLP 的服务提供商 OpenAI,微软，百度文心(待接入)，google(待接入)
+ */
+exports.AIProviderEnum = {
+    OPENAI: 'openai',
+    MICROSOFT: 'microsoft',
+    BAIDU: 'baidu',
+    GOOGLE: 'google'
+};
+/**
+ * 根据类型创建不同的TTS引擎对象
+ * @param {*} provider
+ * @param {*} apikey
+ * @param {*} setting
+ * @returns
+ */
+function createAIInstance(provider, apikey, setting) {
+    let { model, maxtoken, temperature, endpoint, engine, version } = setting || {};
+    switch (provider) {
+        case exports.AIProviderEnum.OPENAI:
+            return new openai_1.default(apikey + '', { model, maxtoken, temperature });
+        case exports.AIProviderEnum.MICROSOFT:
+            return new azureai_1.default(apikey + '', { endpoint, engine, version }, { model, maxtoken, temperature });
+        case exports.AIProviderEnum.BAIDU:
+            let cred = typeof (apikey) === 'string' ? { apikey, securitykey: apikey } : apikey;
+            return new baiduai_1.default(cred);
+        default: return null;
+    }
+}
+exports.createAIInstance = createAIInstance;
+;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiaichat",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
   "scripts": {
@@ -16,6 +16,7 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
+    "axios": "^1.3.4",
     "openai": "^3.2.1"
   }
 }

package/src/azureai.ts

@@ -1,9 +1,7 @@
-import { AzureOpenAIPatameters, ChatReponse, OpenAIApiParameters } from "./declare";
-import { AxiosRequestConfig, AxiosResponse, Axios } from "axios";
+import { AzureOpenAIPatameters, ChatReponse, OpenAIApiParameters, request } from "./declare";
 import OpenAIGpt from "./openai" 
 import { ChatCompletionRequestMessage } from "openai";
 export default class AzureAI extends OpenAIGpt {
-    protected readonly apiKey: string;
     protected readonly azureSetting: AzureOpenAIPatameters;
     constructor(apiKey: string, azureOption:AzureOpenAIPatameters, apiOption: OpenAIApiParameters = {}) {
         super(apiKey, apiOption);
@@ -22,7 +20,7 @@ export default class AzureAI extends OpenAIGpt {
     /**
      * 请求GPT接口
      */
-    public async chatRequest(chatText: string | Array<any>, paramOption: OpenAIApiParameters, axiosOption: AxiosRequestConfig = {}): Promise<ChatReponse> {
+    public override async chatRequest(chatText: string | Array<any>, paramOption: OpenAIApiParameters, axiosOption: any = {}): Promise<ChatReponse> {
         if (!chatText) return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
         if (!axiosOption.headers )
             axiosOption.headers = { 'api-key': this.apiKey,'Content-Type':'application/json'};
@@ -33,13 +31,19 @@ export default class AzureAI extends OpenAIGpt {
 
         let messages: Array<ChatCompletionRequestMessage> = typeof (chatText) == 'string' ?
             [{ role: 'user', content: chatText }] : chatText;
-        let axios = new Axios(axiosOption)
         try{
-            const response = await axios.post(this.BaseUrl, {
-                messages,
-                temperature: Number(paramOption?.temperature || this.temperature),
-                max_tokens: Number(paramOption?.maxtoken || this.maxtoken),
-            })
+            let param = {
+                ...axiosOption,
+                method: "post",
+                data: {
+                    messages,
+                    temperature: Number(paramOption?.temperature || this.temperature),
+                    max_tokens: Number(paramOption?.maxtoken || this.maxtoken),
+                },
+                url: this.BaseUrl
+            };
+            // console.log('axiosOption', param)
+            const response =await request(param)
             if (response.data.choices){
                 return { successed: true, message: response.data.choices };
             }

package/src/baiduai.ts

@@ -0,0 +1,103 @@
+import { EmotionResult, SimilarityResult, ChatReponse, SummaryReponse, ExaminationPaperResult, ApiResult, CacheProvider, request } from "./declare";
+import GptBase from "./gptbase"
+const TOKEN_CACHE_KEY = "key:_doomisoft:baiduwenxin:"
+export default class BaiduWenXinAI extends GptBase {
+    protected credential: ApiCredential;
+    private Cacher: CacheProvider|undefined;
+    /**
+     * 
+     * @param credential 调用OpenAI 的key
+     * @param cacher  用作accesstoken的缓存 
+     * @param apiOption  用作accesstoken的缓存 
+     */
+    constructor(credential: ApiCredential, cacher?:CacheProvider) {
+        super();
+        this.credential = credential;
+        this.Cacher = cacher;
+    }
+    /**
+     * 获取调用Api的Token
+     */
+    async getAccessToken():Promise<AccessTokenResult>{
+        ////如果当前应用是一个委托到第三方的
+        ///公众号或小程序，则需要用关联的第三方平台来获取api调用的accesstoken
+        ////如果是需要缓存token,则首先看缓存中是否有AccessToken
+        const accesstoken = this.Cacher ? (await this.Cacher.get(TOKEN_CACHE_KEY+this.credential.apikey)):null;
+        if (accesstoken) return { successed: true, access_token: accesstoken };
+        const option = {
+            url: `https://wenxin.baidu.com/moduleApi/portal/api/oauth/token?grant_type=client_credentials&client_id=${this.credential.apikey}&client_secret=${this.credential.securitykey}`,
+            method:"post",
+        };
+        const tokenData = await request(option);
+        if (tokenData.successed == true && !tokenData.data.code) {
+            ///把api accesstoken缓存起来
+            if (this.Cacher){
+                this.Cacher.set(TOKEN_CACHE_KEY + this.credential.apikey, tokenData.data.data,3600*20);
+            }
+            return { successed: true, access_token: tokenData.data.data };
+        }
+        return { successed: false, error: tokenData.data.msg }
+    }
+    /**
+     * 请求GPT接口
+     */
+    public async chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any = {}): Promise<ApiResult> {
+        console.log('call baidu')
+        if (!chatText) return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
+        const accessToken = await this.getAccessToken();
+        if (!accessToken.successed || !accessToken.access_token) return {successed:false,error:'accesstoken get failed'}
+        try {
+            let param = {
+                ...axiosOption,
+                method: "post",
+                data: {
+                    text: `问题：${chatText}\n回答：`,
+                    seq_len: 512,
+                    topp: 0.5,
+                    penalty_score: 1.2,
+                    min_dec_len: 12,
+                    min_dec_penalty_text: "。?：！[<S>]",
+                    task_prompt: "qa",
+                    mask_type: "paragraph"
+                },
+                url:`https://wenxin.baidu.com/moduleApi/portal/api/rest/1.0/ernie/3.0.25/zeus?access_token=${accessToken.access_token}`
+            };
+            console.log('param', param)
+            const response = await request(param)
+            if (response.successed && !response.data.code) {
+                return { successed: true, ...response.data };
+            }
+            return { successed: false, ...response.data };
+        } catch (error) {
+            console.log('result is error ', error)
+            return { successed: false, error };
+        }
+
+    }
+    getScentenceEmotional(_s1: string, _axiosOption: any): Promise<EmotionResult> {
+        throw new Error("Method not implemented.");
+    }
+    getScentenseSimilarity(_s1: string, _s2: string, _axiosOption: any): Promise<SimilarityResult> {
+        throw new Error("Method not implemented.");
+    }
+    getSimilarityContent(_content: string, _count: number, _axiosOption: any): Promise<ChatReponse> {
+        throw new Error("Method not implemented.");
+    }
+    getSummaryOfContent(_content: string | any[], _axiosOption: any): Promise<SummaryReponse> {
+        throw new Error("Method not implemented.");
+    }
+    generateQuestionsFromContent(_content: string, _count: number, _axiosOption: any): Promise<ChatReponse> {
+        throw new Error("Method not implemented.");
+    }
+    generateExaminationPaperFromContent(_content: string, _paperOption: any, _axiosOption: any): Promise<ExaminationPaperResult> {
+        throw new Error("Method not implemented.");
+    }
+
+}
+export interface AccessTokenResult extends ApiResult {
+    'access_token'?: string
+}
+export interface ApiCredential{
+    'apikey':string,
+    'securitykey': string
+}

package/src/declare.ts

@@ -1,5 +1,6 @@
 
-interface ApiResult {
+import axios from 'axios';
+export interface ApiResult {
     /**
      * return the result of api called
      * @type {boolean}
@@ -102,4 +103,51 @@ export interface SimilarityResult extends ApiResult {
  */
 export interface EmotionResult extends ApiResult {
     'emotion'?: string;    ///情绪
+}
+/**
+ * 远程请求的返回
+ */
+export interface RpcResult extends ApiResult {
+    'data'?: any;
+}
+
+/**
+ * Axios远程请求封装
+ * @param opts 
+ * @returns 
+ */
+export async function request(opts: any = {}): Promise<RpcResult> {
+    if (!opts.data) opts.data = opts.body;
+    try {
+        let result = await axios(opts);
+        return { successed: true, data: result.data }
+    } catch (err) {
+        return { successed: false, error: err }
+    }
+}
+
+
+/**
+ * 数据缓存提供者接口
+ */
+export interface CacheProvider {
+    /**
+     * 缓存数据
+     * @param key 数据的键名称
+     * @param value 数据的键值
+     */
+    set(key: string, value: string | object, exp?: number): void;
+    /**
+     * 从缓存中读取数据
+     * @param key 数据的键名称
+     */
+    get(key: string): Promise<string | null>;
+
+
+    /**
+     * 删除缓存信息
+     * @param key 数据的键名称
+     */
+    delete(key: string): void;
+
 }

package/src/gptbase.ts

@@ -0,0 +1,58 @@
+import { EventEmitter } from "events"
+import { ChatReponse, SummaryReponse, ExaminationPaperResult, EmotionResult, SimilarityResult, ApiResult } from './declare'
+
+export default abstract class GptBase extends EventEmitter {
+    /**
+     * 构造函数
+     */
+    constructor() {
+        super();
+    }
+    /**
+     * 自由聊天模式
+     * @param chatText 
+     * @param _paramOption 
+     * @param axiosOption 
+     */
+    abstract chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any): Promise<ApiResult>;
+    /**
+     * 获取句子的情感
+     * @param s1 
+     * @param axiosOption 
+     */
+    abstract getScentenceEmotional(s1: string, axiosOption: any ): Promise<EmotionResult> ;
+    /**
+     * 获取两段文本的相似度
+     * @param s1 
+     * @param s2 
+     * @param axiosOption 
+     */
+    abstract getScentenseSimilarity(s1: string, s2: string, axiosOption: any): Promise<SimilarityResult>;
+    /**
+     * 获取一段文本的相似内容
+     * @param content 
+     * @param count 
+     * @param axiosOption 
+     */
+    abstract getSimilarityContent(content: string, count: number, axiosOption: any): Promise<ChatReponse>;
+    /**
+     * 获取内容的摘要
+     * @param content 
+     * @param axiosOption 
+     */
+    abstract getSummaryOfContent(content: string | Array<any>, axiosOption: any): Promise<SummaryReponse>;
+    /**
+     * 从内容中提取问题和答案及管件子
+     * @param content 
+     * @param count 
+     * @param axiosOption 
+     */
+    abstract generateQuestionsFromContent(content: string, count: number, axiosOption: any): Promise<ChatReponse>;
+    /**
+     * 从内容中提取单选多选判断填空题
+     * @param content 
+     * @param paperOption 
+     * @param axiosOption 
+     */
+    abstract generateExaminationPaperFromContent(content: string, paperOption: any, axiosOption: any): Promise<ExaminationPaperResult>;
+}

package/src/gptprovider.ts

@@ -0,0 +1,38 @@
+//ts check
+/**
+* 语音转文字服务商工厂
+*/
+import OpenAIGpt from './openai';
+import AzureAI from './azureai'
+import BaiduWenXinAI, { ApiCredential } from './baiduai'
+import GptBase from './gptbase';
+/**
+ * OpenAI/NLP 的服务提供商 OpenAI,微软，百度文心(待接入)，google(待接入)
+ */
+export const GptProviderEnum = {
+    OPENAI: 'openai',
+    MICROSOFT: 'microsoft',
+    BAIDU: 'baidu',
+    GOOGLE:'google'
+} as const;
+export type GptProviderEnum = typeof GptProviderEnum[keyof typeof GptProviderEnum];
+/**
+ * 根据类型创建不同的TTS引擎对象
+ * @param {*} provider 
+ * @param {*} apikey 
+ * @param {*} setting 
+ * @returns 
+ */
+export function createGpt(provider: GptProviderEnum, apikey: string|ApiCredential, setting: any): GptBase | null {
+    let { model, maxtoken, temperature,endpoint,engine,version } = setting || {};
+    switch (provider) {
+        case GptProviderEnum.OPENAI: 
+            return new OpenAIGpt(apikey+'', { model, maxtoken, temperature });
+        case GptProviderEnum.MICROSOFT: 
+            return new AzureAI(apikey+'', { endpoint, engine, version }, { model, maxtoken, temperature }, );
+        case GptProviderEnum.BAIDU:
+            let cred: ApiCredential = typeof (apikey) === 'string' ? { apikey, securitykey: apikey } : apikey
+            return new BaiduWenXinAI(cred);
+        default: return null;
+    }
+};

package/src/index.ts

@@ -1 +1,2 @@
-export * as AIFactory from "./openaiprovider";
+export * as GptFactory from "./gptprovider";
+export * as GptBase from "./gptbase";

package/src/openai.ts

@@ -1,6 +1,6 @@
-import { Configuration, OpenAIApi, CreateChatCompletionResponse, ChatCompletionRequestMessage } from "openai"
-import { EventEmitter } from "events";
-import { AxiosRequestConfig, AxiosResponse } from "axios";
+import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "openai"
+// import { EventEmitter } from "events";
+import GptBase from "./gptbase"
 import { OpenAIApiParameters, ChatReponse, OutlineSummaryItem, SummaryReponse, FaqItem, ExaminationPaperResult, EmotionResult, SimilarityResult, QuestionItem } from './declare'
 const SECTION_LENGTH = 1600;     ///每2400个字符分成一组
 const MESSAGE_LENGTH = 1;      ///每次送8句话给openai 进行解析，送多了，会报错
@@ -14,7 +14,7 @@ const QUESTION_TEXT_MAPPING: any = {
 
 const QUESTION_TYPE: string[] = ['singlechoice', 'multiplechoice', 'trueorfalse', 'completion']
 
-export default class OpenAIGpt extends EventEmitter {
+export default class OpenAIGpt extends GptBase {
     protected readonly apiKey: string;
     private aiApi: OpenAIApi | undefined;
     protected readonly chatModel: string;
@@ -42,7 +42,7 @@ export default class OpenAIGpt extends EventEmitter {
      * 向OpenAI发送一个聊天请求
      * @param {*} chatText 
      */
-    public async chatRequest(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: AxiosRequestConfig = {}): Promise<ChatReponse> {
+    public async chatRequest(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: any = {}): Promise<ChatReponse> {
         if (!chatText) return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
         if (!this.aiApi){
             this.aiApi = this.createOpenAI(this.apiKey);
@@ -53,8 +53,7 @@ export default class OpenAIGpt extends EventEmitter {
             [{ role: 'user', content: chatText }] : chatText;
         // console.log('message', message)
         try {
-            const response: AxiosResponse<CreateChatCompletionResponse, any>
-                = await this.aiApi.createChatCompletion({
+            const response= await this.aiApi.createChatCompletion({
                     model: callChatOption?.model || this.chatModel,
                     messages: message,
                     temperature: Number(callChatOption?.temperature || this.temperature),
@@ -124,7 +123,7 @@ export default class OpenAIGpt extends EventEmitter {
      * @param {*} content 
      * @param {需要出来的数量} count 
      */
-    async getSimilarityContent(content: string, count: number = 1, axiosOption: AxiosRequestConfig = {}): Promise<ChatReponse> {
+    async getSimilarityContent(content: string, count: number = 1, axiosOption: any = {}): Promise<ChatReponse> {
         let chnReg: boolean = /([\u4e00-\u9fa5]|[\ufe30-\uffa0])/.test(content)  ///检查源话是否含有中文内容
         let engReg: boolean = /[a-zA-Z]/.test(content)  ///检查源话是否含有英文内容
         ///如果源话是全中文，那么结果中不应该出来英文的相似说法，如果源话是全英文，则结果不能出现全中文的说法
@@ -140,7 +139,7 @@ export default class OpenAIGpt extends EventEmitter {
      * @param content 
      * @param axiosOption 
      */
-    async getSummaryOfContent(content: string | Array<any>, axiosOption: AxiosRequestConfig = {}): Promise<SummaryReponse> {
+    async getSummaryOfContent(content: string | Array<any>, axiosOption: any = {}): Promise<SummaryReponse> {
         const arrContent = typeof (content) == 'string' ? this.splitLongText(content) : content;
         let summary: Array<OutlineSummaryItem> = [];
         while (arrContent.length > 0) {
@@ -168,12 +167,12 @@ export default class OpenAIGpt extends EventEmitter {
      * @param {*} axiosOption 
      * @returns 
      *///并在答案末尾处必须给出答案内容中的关键词
-    async generateQuestionsFromContent(content: string, count: number = 1, axiosOption: AxiosRequestConfig = {}): Promise<ChatReponse> {
+    async generateQuestionsFromContent(content: string, count: number = 1, axiosOption: any = {}): Promise<ChatReponse> {
         let arrContent = this.splitLongText(content, 300);
         ///没20句话分为一组，适应大文件内容多次请求组合结果
         ///每一句话需要产生的题目
         let questions4EverySentense: number = count / arrContent.length; //Math.ceil(arrContent.length / 20);
-        let faqs: Array<FaqItem> = [], gotted: number = 0;
+        let faqs: FaqItem[] = [], gotted: number = 0;
         while (arrContent.length > 0 && gotted < count) {
             questions4EverySentense = (count - gotted) / arrContent.length
             ////每次最多送MESSAGE_LENGTH句话给openai
@@ -182,7 +181,7 @@ export default class OpenAIGpt extends EventEmitter {
             //subarray.push({ role: 'user', content:'请根据上述内容,给出一道提问与答案以及答案关键词，按照先问题内容，再标准答案，再关键词的顺序输出,关键词之间用、分开'})
             subarray.unshift({ role: 'system', content: `你是一位专业培训师,从以下内容中提取${itemCount}条提问及答案，并从答案内容提取出至少2个关键词，最终结果按照[{"question":"提问内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]的JSON数组结构输出。` })
             //subarray.unshift({ role: 'system', content: `你是一位专业程序开发工程师,根据以下内容,按照[{"question":"问题内容","answer":"答案内容","keywords":["关键词1","关键词2"]}]JSON数组结构,给出${itemCount}条提问问题及答案以及答案关键词` })
-            console.log('subarray', subarray)
+            // console.log('subarray', subarray)
             let result = await this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
             if (result.successed && result.message) {
                 // console.log('result is ', result.message[0].message.content)
@@ -202,7 +201,7 @@ export default class OpenAIGpt extends EventEmitter {
         arrContent = [];  /// 释放内存
         ///发出信号，解析完毕
         this.emit('parseover', { type: 'qa', items: faqs })
-        return { successed: true, message: faqs };
+        return { successed: true, message: faqs.slice(0, count) };
     }
 
     /**
@@ -212,7 +211,7 @@ export default class OpenAIGpt extends EventEmitter {
      * @param {*} axiosOption 
      * @returns 
      *///并在答案末尾处必须给出答案内容中的关键词
-    async generateQuestionsFromContent_Orgin(content: string, count: number = 1, promotion: string | null = null, sliceslength: number = SECTION_LENGTH, axiosOption: AxiosRequestConfig = {}): Promise<ChatReponse> {
+    async generateQuestionsFromContent_Orgin(content: string, count: number = 1, promotion: string | null = null, sliceslength: number = SECTION_LENGTH, axiosOption: any = {}): Promise<ChatReponse> {
         let arrContent = this.splitLongText(content, sliceslength || 300);
         ///没20句话分为一组，适应大文件内容多次请求组合结果
         ///每一句话需要产生的题目
@@ -278,7 +277,7 @@ export default class OpenAIGpt extends EventEmitter {
      * @param {*} axiosOption 
      * @returns 
      *///并在答案末尾处必须给出答案内容中的关键词
-    async generateExaminationPaperFromContent(content: string, paperOption: any = {}, axiosOption: AxiosRequestConfig = {}): Promise<ExaminationPaperResult> {
+    async generateExaminationPaperFromContent(content: string, paperOption: any = {}, axiosOption: any = {}): Promise<ExaminationPaperResult> {
         let arrContent = this.splitLongText(content, 1024);
         let sectionCount: any = {
             singlechoice: (paperOption.singlechoice?.count || 0) / arrContent.length,
@@ -417,42 +416,6 @@ export default class OpenAIGpt extends EventEmitter {
             console.log('error happened:', err);
         }
         return returnItems.filter(i => { return i != null; }).slice(0, count);
-        // let item = result.map(m => {
-        //     ////防止输出的JSON格式不合法
-        //     try {
-        //         let jsonObj = JSON.parse(m.message.content)
-        //         jsonObj.score = score;
-        //         if (jsonObj.choice && Array.isArray(jsonObj.choice) && questiontype != 'completion') {
-        //             jsonObj.fullanswer = (jsonObj.answer + '').replace(/,|[^ABCDE]/g, '');
-        //             jsonObj.choice = jsonObj.choice.map((item:string, index:number) => {
-        //                 let seqNo = String.fromCharCode(65 + index);
-        //                 let correctReg = new RegExp(`${seqNo}.|${seqNo}`, 'ig')
-        //                 //let answer = jsonObj.fullanswer
-        //                 return {
-        //                     id: seqNo,
-        //                     content: item.replace(correctReg, '').trim(),
-        //                     iscorrect: (jsonObj.fullanswer.indexOf(seqNo) >= 0 || jsonObj.fullanswer.indexOf(m)) >= 0 ? 1 : 0
-        //                 }
-        //             })
-        //         }
-        //         switch (questiontype) {
-        //             case 'singlechoice':
-        //                 jsonObj.answer = (jsonObj.answer + '').replace(/,|[^ABCDEFG]/g, '').split('').slice(0, 1);
-        //                 break;
-        //             case 'multiplechoice':
-        //                 jsonObj.answer = (jsonObj.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
-        //                 break;
-        //             case 'trueorfalse':
-        //                 jsonObj.answer = [(jsonObj.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
-        //                 break;
-        //         }
-        //         return jsonObj;
-        //     } catch (err) {
-        //         console.log('error happened:', err);
-        //         return null;
-        //     }
-        // })
-        // return item.filter(i => { return i != null; });
     }
     /**
      * 将一段很长的文本，按1024长度来划分到多个中

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
     "files": [
-        "src/openai.ts"
+        "src/index.ts"
     ],
     "compilerOptions": {
         "target": "es2015",