doomiaichat 2.7.0 → 3.0.0

package/dist/azureai.d.ts

@@ -1,12 +1,16 @@
+import { OpenAIApi } from "azure-openai";
 import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters } from "./declare";
 import OpenAIGpt from "./openai";
 export default class AzureAI extends OpenAIGpt {
     protected readonly azureSetting: AzureOpenAIPatameters;
     constructor(apiKey: string, azureOption: AzureOpenAIPatameters, apiOption?: OpenAIApiParameters);
+    /**
+     * 初始化OpenAI 的聊天对象Api
+     */
+    createOpenAI(apiKey: string): OpenAIApi;
     /**
      * ZAure OpenAI 最新的URL地址
      */
-    get BaseUrl(): string;
     get EmbeddingUrl(): string;
     /**
      * 获得文字的向量
@@ -16,7 +20,12 @@ export default class AzureAI extends OpenAIGpt {
     /**
      * 请求GPT接口
      */
-    chatRequest(chatText: string | Array<any>, paramOption: OpenAIApiParameters, axiosOption?: any): Promise<ChatReponse>;
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
     /**
       * 获得一种内容的相似说法
       * 微软的AI参数中已经没有了n的参数

package/dist/azureai.js

@@ -12,7 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const azure_openai_1 = require("azure-openai");
 const declare_1 = require("./declare");
+// import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "azure-openai"
 const openai_1 = __importDefault(require("./openai"));
 class AzureAI extends openai_1.default {
     constructor(apiKey, azureOption, apiOption = {}) {
@@ -24,13 +26,24 @@ class AzureAI extends openai_1.default {
         }
     }
     /**
-     * ZAure OpenAI 最新的URL地址
+     * 初始化OpenAI 的聊天对象Api
      */
-    get BaseUrl() {
-        return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.engine}/chat/completions?api-version=${this.azureSetting.version || '2023-03-15-preview'}`;
+    createOpenAI(apiKey) {
+        return new azure_openai_1.OpenAIApi(new azure_openai_1.Configuration({ apiKey,
+            azure: {
+                apiKey,
+                endpoint: this.azureSetting.endpoint,
+                deploymentName: this.azureSetting.engine
+            } }));
     }
+    /**
+     * ZAure OpenAI 最新的URL地址
+     */
+    // get BaseUrl(): string {
+    //     return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.engine}/chat/completions?api-version=${this.azureSetting.version || '2023-03-15-preview'}`
+    // }
     get EmbeddingUrl() {
-        return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.embedding || 'openai-embedding-ada-002'}/embeddings?api-version=2022-12-01`;
+        return `${this.azureSetting.endpoint}/openai/deployments/${this.embeddingmodel || 'openai-embedding-ada-002'}/embeddings?api-version=2022-12-01`;
     }
     /**
      * 获得文字的向量
@@ -64,37 +77,55 @@ class AzureAI extends openai_1.default {
     /**
      * 请求GPT接口
      */
-    chatRequest(chatText, paramOption, axiosOption = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!chatText)
-                return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
-            if (!axiosOption.headers)
-                axiosOption.headers = { 'api-key': this.apiKey, 'Content-Type': 'application/json' };
-            else {
-                axiosOption.headers['api-key'] = this.apiKey;
-                axiosOption.headers['Content-Type'] = 'application/json';
-            }
-            let messages = typeof (chatText) == 'string' ?
-                [{ role: 'user', content: chatText }] : chatText;
-            try {
-                let param = Object.assign(Object.assign({}, axiosOption), { method: "post", data: {
-                        messages,
-                        temperature: Number((paramOption === null || paramOption === void 0 ? void 0 : paramOption.temperature) || this.temperature),
-                        max_tokens: Number((paramOption === null || paramOption === void 0 ? void 0 : paramOption.maxtoken) || this.maxtoken),
-                    }, url: this.BaseUrl });
-                // console.log('axiosOption', param)
-                const response = yield (0, declare_1.request)(param);
-                if (response.data.choices) {
-                    return { successed: true, message: response.data.choices };
-                }
-                return Object.assign({ successed: false }, response.data);
-            }
-            catch (error) {
-                console.log('result is error ', error);
-                return { successed: false, error };
-            }
-        });
-    }
+    // 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' };
+    //     // else {
+    //     //     axiosOption.headers['api-key'] = this.apiKey;
+    //     //     axiosOption.headers['Content-Type'] = 'application/json';
+    //     // }
+    //     if (!this.azureApi) {
+    //         this.azureApi = this.createAzureAI(this.apiKey);
+    //     }
+    //     let messages: Array<ChatCompletionRequestMessage> = typeof (chatText) == 'string' ?
+    //         [{ role: 'user', content: chatText }] : chatText;
+    //     try {
+    //         // 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)
+    //         const response: any = await this.azureApi.createChatCompletion({
+    //             model: this.azureSetting.engine,
+    //             messages: messages,
+    //             temperature: Number(paramOption?.temperature || this.temperature),
+    //             max_tokens: Number(paramOption?.maxtoken || this.maxtoken),
+    //             n: Number(paramOption?.replyCounts || 1) || 1
+    //         }, axiosOption);
+    //         console.log('response.data', JSON.stringify(response.data))
+    //         if (response.data.choices) {
+    //             return { successed: true, message: response.data.choices, usage: response.data.usage };
+    //         }
+    //         return { successed: false, ...response.data };
+    //     } catch (error) {
+    //         console.log('result is error ', error)
+    //         return { successed: false, error };
+    //     }
+    // }
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
     /**
       * 获得一种内容的相似说法
       * 微软的AI参数中已经没有了n的参数

package/dist/baiduai.d.ts

@@ -23,6 +23,7 @@ export default class BaiduWenXinAI extends GptBase {
      * 请求GPT接口
      */
     chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption?: any): Promise<ApiResult>;
+    chatRequestInStream(_chatText: string | any[], _paramOption: any, _axiosOption: any): void;
     commentQuestionAnswer(_question: string, _answer: string, _axiosOption: any): Promise<CommentResult>;
     getScentenceEmotional(_s1: string, _axiosOption: any): Promise<EmotionResult>;
     getScentenseSimilarity(_s1: string, _s2: string, _axiosOption: any): Promise<SimilarityResult>;

package/dist/baiduai.js

@@ -97,6 +97,9 @@ class BaiduWenXinAI extends gptbase_1.default {
             }
         });
     }
+    chatRequestInStream(_chatText, _paramOption, _axiosOption) {
+        throw new Error("Method not implemented.");
+    }
     commentQuestionAnswer(_question, _answer, _axiosOption) {
         throw new Error("Method not implemented.");
     }

package/dist/declare.d.ts

@@ -21,6 +21,7 @@ export interface ChatReponse extends ApiResult {
      * @memberof ChatReponse
      */
     'message'?: Array<any>;
+    'usage'?: any;
 }
 export interface OutlineSummaryItem {
     /**
@@ -46,6 +47,7 @@ export interface SummaryReponse extends ApiResult {
  * 调用OpenAI Api的参数约定
  */
 export interface OpenAIApiParameters {
+    'embedding'?: string;
     'model'?: string;
     'maxtoken'?: number;
     'temperature'?: number;

package/dist/gptbase.d.ts

@@ -18,6 +18,13 @@ export default abstract class GptBase extends EventEmitter {
      * @param axiosOption
      */
     abstract chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any): Promise<ApiResult>;
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
+    abstract chatRequestInStream(chatText: string | Array<any>, _paramOption: any, axiosOption: any): void;
     /**
      * 点评问题回答的评价
      * @param question  问题题干

package/dist/gptprovider.js

@@ -28,12 +28,12 @@ exports.GptProviderEnum = {
  * @returns
  */
 function createGpt(provider, apikey, setting) {
-    let { model, maxtoken, temperature, endpoint, engine, version } = setting || {};
+    let { model, maxtoken, temperature, endpoint, engine, version, embedding } = setting || {};
     switch (provider) {
         case exports.GptProviderEnum.OPENAI:
-            return new openai_1.default(apikey + '', { model, maxtoken, temperature });
+            return new openai_1.default(apikey + '', { model, maxtoken, temperature, embedding });
         case exports.GptProviderEnum.MICROSOFT:
-            return new azureai_1.default(apikey + '', { endpoint, engine, version }, { model, maxtoken, temperature });
+            return new azureai_1.default(apikey + '', { endpoint, engine, version }, { model, maxtoken, temperature, embedding });
         case exports.GptProviderEnum.BAIDU:
             let cred = typeof (apikey) === 'string' ? { apikey, securitykey: apikey } : apikey;
             return new baiduai_1.default(cred);

package/dist/openai.d.ts

@@ -1,12 +1,13 @@
-import { OpenAIApi, ChatCompletionRequestMessage } from "openai";
+import { OpenAIApi, ChatCompletionRequestMessage } from "azure-openai";
 import GptBase from "./gptbase";
 import { OpenAIApiParameters, ChatReponse, SummaryReponse, FaqItem, ExaminationPaperResult, EmotionResult, SimilarityResult, QuestionItem, CommentResult, EmbeddingResult } from './declare';
 export default class OpenAIGpt extends GptBase {
     protected readonly apiKey: string;
-    private aiApi;
+    protected aiApi: OpenAIApi | undefined;
     protected readonly chatModel: string;
     protected readonly maxtoken: number;
     protected readonly temperature: number;
+    protected readonly embeddingmodel: string;
     /**
      *
      * @param apiKey 调用OpenAI 的key
@@ -27,6 +28,13 @@ export default class OpenAIGpt extends GptBase {
      * @param {*} chatText
      */
     chatRequest(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption?: any): Promise<ChatReponse>;
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
+    chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: any): Promise<void>;
     /**
      * 点评问题回答的评价
      * @param question

package/dist/openai.js

@@ -12,7 +12,7 @@ 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 azure_openai_1 = require("azure-openai");
 // import { EventEmitter } from "events";
 const gptbase_1 = __importDefault(require("./gptbase"));
 const SECTION_LENGTH = 1600; ///每2400个字符分成一组
@@ -37,12 +37,13 @@ class OpenAIGpt extends gptbase_1.default {
         this.chatModel = apiOption.model || 'gpt-3.5-turbo';
         this.maxtoken = apiOption.maxtoken || 2048;
         this.temperature = apiOption.temperature || 0.9;
+        this.embeddingmodel = apiOption.embedding || 'text-embedding-ada-002';
     }
     /**
      * 初始化OpenAI 的聊天对象Api
      */
     createOpenAI(apiKey) {
-        return new openai_1.OpenAIApi(new openai_1.Configuration({ apiKey }));
+        return new azure_openai_1.OpenAIApi(new azure_openai_1.Configuration({ apiKey }));
     }
     /**
      * 获得文字的向量
@@ -55,16 +56,15 @@ class OpenAIGpt extends gptbase_1.default {
             if (!this.aiApi) {
                 this.aiApi = this.createOpenAI(this.apiKey);
             }
-            // console.log('message', message)
             try {
                 const response = yield this.aiApi.createEmbedding({
-                    model: 'text-embedding-ada-002',
+                    model: this.embeddingmodel,
                     input: text,
                 }, axiosOption);
                 return { successed: true, embedding: response.data.data[0].embedding };
             }
             catch (error) {
-                console.log('result is error ', error);
+                // console.log('result is error ', error)
                 return { successed: false, error };
             }
         });
@@ -92,7 +92,7 @@ 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);
-                return { successed: true, message: response.data.choices };
+                return { successed: true, message: response.data.choices, usage: response.data.usage };
             }
             catch (error) {
                 console.log('result is error ', error);
@@ -100,6 +100,63 @@ class OpenAIGpt extends gptbase_1.default {
             }
         });
     }
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
+    chatRequestInStream(chatText, callChatOption, axiosOption) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!chatText)
+                this.emit('chaterror', { successed: false, error: 'no text in chat' });
+            if (!this.aiApi) {
+                this.aiApi = this.createOpenAI(this.apiKey);
+            }
+            let message = typeof (chatText) == 'string' ?
+                [{ role: 'user', content: chatText }] : chatText;
+            axiosOption = Object.assign({}, axiosOption || { timeout: 60000 }, { responseType: 'stream' });
+            try {
+                let finishreason = null, usage = null;
+                const response = yield this.aiApi.createChatCompletion({
+                    // engine: callChatOption?.engine||this.engine,
+                    model: (callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.model) || this.chatModel,
+                    messages: message,
+                    stream: true,
+                    temperature: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.temperature) || this.temperature),
+                    max_tokens: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.maxtoken) || this.maxtoken)
+                }, axiosOption);
+                response.data.on('data', (data) => {
+                    const lines = data.toString().split('\n').filter((line) => line.trim() !== '');
+                    for (const line of lines) {
+                        const message = line.replace(/^data: /, '');
+                        // console.log('message', message)
+                        if (message === '[DONE]') {
+                            this.emit('chatdone', { successed: true, finish_reason: finishreason, usage });
+                            return; // Stream finished
+                        }
+                        try {
+                            ///{ delta: { content: '$\\' }, index: 0, finish_reason: null }
+                            ///发送出去
+                            const parsed = JSON.parse(message);
+                            finishreason = parsed.choices[0].finish_reason;
+                            usage = parsed.usage;
+                            this.emit('chattext', { successed: true, text: parsed.choices[0].delta.content, finish_reason: parsed.choices[0].finish_reason, index: parsed.choices[0].index, usage });
+                        }
+                        catch (error) {
+                            this.emit('chaterror', { successed: false, error: 'no text in chat', message });
+                            //console.error('Could not JSON parse stream message', message, error);
+                        }
+                    }
+                });
+            }
+            catch (error) {
+                this.emit('error', { successed: false, error: 'call axios faied ' + error });
+                //console.log('result is error ', error)
+                // return { successed: false, error };
+            }
+        });
+    }
     /**
      * 点评问题回答的评价
      * @param question

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiaichat",
-  "version": "2.7.0",
+  "version": "3.0.0",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
   "scripts": {
@@ -17,6 +17,6 @@
   },
   "dependencies": {
     "axios": "^1.3.4",
-    "openai": "^3.2.1"
+    "azure-openai": "^0.9.4"
   }
 }

package/src/azureai.ts

@@ -1,32 +1,44 @@
+import { Configuration, OpenAIApi } from "azure-openai";
 import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters, request } from "./declare";
-import OpenAIGpt from "./openai" 
-import { ChatCompletionRequestMessage } from "openai";
+// import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "azure-openai"
+import OpenAIGpt from "./openai"
 export default class AzureAI extends OpenAIGpt {
     protected readonly azureSetting: AzureOpenAIPatameters;
-    constructor(apiKey: string, azureOption:AzureOpenAIPatameters, apiOption: OpenAIApiParameters = {}) {
+    constructor(apiKey: string, azureOption: AzureOpenAIPatameters, apiOption: OpenAIApiParameters = {}) {
         super(apiKey, apiOption);
         this.azureSetting = azureOption;
         if (!this.azureSetting.endpoint.toLowerCase().startsWith('https://') &&
-            !this.azureSetting.endpoint.toLowerCase().startsWith('https://')){
+            !this.azureSetting.endpoint.toLowerCase().startsWith('https://')) {
             this.azureSetting.endpoint = 'https://' + this.azureSetting.endpoint;
         }
     }
     /**
-     * ZAure OpenAI 最新的URL地址
+     * 初始化OpenAI 的聊天对象Api
      */
-    get BaseUrl():string{
-        return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.engine}/chat/completions?api-version=${this.azureSetting.version ||'2023-03-15-preview'}`
+    override createOpenAI(apiKey: string): OpenAIApi {
+        return new OpenAIApi(new Configuration({ apiKey,
+            azure:{
+                apiKey,
+                endpoint: this.azureSetting.endpoint,
+                deploymentName: this.azureSetting.engine
+            } }))
     }
+    /**
+     * ZAure OpenAI 最新的URL地址
+     */
+    // get BaseUrl(): string {
+    //     return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.engine}/chat/completions?api-version=${this.azureSetting.version || '2023-03-15-preview'}`
+    // }
 
     get EmbeddingUrl(): string {
-        return `${this.azureSetting.endpoint}/openai/deployments/${this.azureSetting.embedding ||'openai-embedding-ada-002'}/embeddings?api-version=2022-12-01`
+        return `${this.azureSetting.endpoint}/openai/deployments/${this.embeddingmodel || 'openai-embedding-ada-002'}/embeddings?api-version=2022-12-01`
     }
 
     /**
      * 获得文字的向量
      * @param text 
      */
-    override async getTextEmbedding(text: string,axiosOption: any = {}): Promise<EmbeddingResult> {
+    override async getTextEmbedding(text: string, axiosOption: any = {}): Promise<EmbeddingResult> {
         if (!text) return { successed: false, error: { errcode: 2, errmsg: 'content required' } };
         if (!axiosOption.headers)
             axiosOption.headers = { 'api-key': this.apiKey, 'Content-Type': 'application/json' };
@@ -56,40 +68,57 @@ export default class AzureAI extends OpenAIGpt {
     /**
      * 请求GPT接口
      */
-    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'};
-        else{
-            axiosOption.headers['api-key']=this.apiKey;
-            axiosOption.headers['Content-Type'] = 'application/json';
-        }
+    // 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' };
+    //     // else {
+    //     //     axiosOption.headers['api-key'] = this.apiKey;
+    //     //     axiosOption.headers['Content-Type'] = 'application/json';
+    //     // }
+    //     if (!this.azureApi) {
+    //         this.azureApi = this.createAzureAI(this.apiKey);
+    //     }
+    //     let messages: Array<ChatCompletionRequestMessage> = typeof (chatText) == 'string' ?
+    //         [{ role: 'user', content: chatText }] : chatText;
+    //     try {
+    //         // 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)
+    //         const response: any = await this.azureApi.createChatCompletion({
+    //             model: this.azureSetting.engine,
+    //             messages: messages,
+    //             temperature: Number(paramOption?.temperature || this.temperature),
+    //             max_tokens: Number(paramOption?.maxtoken || this.maxtoken),
+    //             n: Number(paramOption?.replyCounts || 1) || 1
+    //         }, axiosOption);
+    //         console.log('response.data', JSON.stringify(response.data))
+    //         if (response.data.choices) {
+    //             return { successed: true, message: response.data.choices, usage: response.data.usage };
+    //         }
+    //         return { successed: false, ...response.data };
+    //     } catch (error) {
+    //         console.log('result is error ', error)
+    //         return { successed: false, error };
+    //     }
+
+    // }
 
-        let messages: Array<ChatCompletionRequestMessage> = typeof (chatText) == 'string' ?
-            [{ role: 'user', content: chatText }] : chatText;
-        try{
-            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 };
-            }
-            return { successed: false, ...response.data };
-        } catch (error) {
-            console.log('result is error ', error)
-            return { successed: false, error };
-        }
-        
-    }
+    /**
+     * 流式的聊天模式
+     * @param chatText 
+     * @param _paramOption 
+     * @param axiosOption 
+     */
     /**
       * 获得一种内容的相似说法
       * 微软的AI参数中已经没有了n的参数
@@ -109,19 +138,19 @@ export default class AzureAI extends OpenAIGpt {
         const messages = [
             { role: 'system', content: '忘记我们的聊天,你现在是一名专业的语言大师' },
             { role: 'user', content: text },
-            { role: 'user', content: '最终结果按照["意思相同语句","意思相同语句"]的JSON数组的格式输出。'}//如:"今天天气真好"的相同2句内容,输出结果为:["今天晴空万里无云","今天的天气适合出游"]。' },
+            { role: 'user', content: '最终结果按照["意思相同语句","意思相同语句"]的JSON数组的格式输出。' }//如:"今天天气真好"的相同2句内容,输出结果为:["今天晴空万里无云","今天的天气适合出游"]。' },
         ]
         let result = await this.chatRequest(messages, {}, axiosOption);
         if (!result.successed || !result.message) return result;
         let value = result.message[0].message.content.trim();
         let replyJson = this.fixedJsonString(value);
         ///能够提取到内容
-        if (replyJson.length) return { successed: true, message:replyJson }
+        if (replyJson.length) return { successed: true, message: replyJson }
         ///回答的内容非JSON格式，自己来提取算了
-        
+
         console.log('自己组装', value);
         let sentences = value.split(/",|\n/g)       ///用换行或",来割分文本内容
-        sentences = sentences.map((str: string)=>{
+        sentences = sentences.map((str: string) => {
             return str.replace(/(\[|"|\]|\{|\})/g, '')
         })
         // let matched = value.match(/\d+分/g), score = 0;

package/src/baiduai.ts

@@ -2,6 +2,7 @@ import { EmotionResult, SimilarityResult, ChatReponse, SummaryReponse, Examinati
 import GptBase from "./gptbase"
 const TOKEN_CACHE_KEY = "key:_doomisoft:baiduwenxin:"
 export default class BaiduWenXinAI extends GptBase {
+    
     protected credential: ApiCredential;
     private Cacher: CacheProvider|undefined;
     /**
@@ -81,6 +82,10 @@ export default class BaiduWenXinAI extends GptBase {
         }
 
     }
+
+    chatRequestInStream(_chatText: string | any[], _paramOption: any, _axiosOption: any): void {
+        throw new Error("Method not implemented.");
+    }
     commentQuestionAnswer(_question: string, _answer: string, _axiosOption: any): Promise<CommentResult>{
         throw new Error("Method not implemented.");
     }

package/src/declare.ts

@@ -24,6 +24,7 @@ export interface ChatReponse extends ApiResult {
      * @memberof ChatReponse
      */
     'message'?: Array<any>;
+    'usage'?:any;
 }
 export interface OutlineSummaryItem {
 
@@ -51,6 +52,7 @@ export interface SummaryReponse extends ApiResult {
  * 调用OpenAI Api的参数约定
  */
 export interface OpenAIApiParameters {
+    'embedding'?:string,       ///模型引擎，兼容Azure
     'model'?: string,      ///模型名称
     'maxtoken'?: number;    ///返回的最大token
     'temperature'?: number;

package/src/gptbase.ts

@@ -20,6 +20,13 @@ export default abstract class GptBase extends EventEmitter {
      * @param axiosOption 
      */
     abstract chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any): Promise<ApiResult>;
+    /**
+     * 流式的聊天模式
+     * @param chatText 
+     * @param _paramOption 
+     * @param axiosOption 
+     */
+    abstract chatRequestInStream(chatText: string | Array<any>, _paramOption: any, axiosOption: any):void;
     /**
      * 点评问题回答的评价
      * @param question  问题题干

package/src/gptprovider.ts

@@ -24,12 +24,12 @@ export type GptProviderEnum = typeof GptProviderEnum[keyof typeof GptProviderEnu
  * @returns 
  */
 export function createGpt(provider: GptProviderEnum, apikey: string|ApiCredential, setting: any): GptBase | null {
-    let { model, maxtoken, temperature,endpoint,engine,version } = setting || {};
+    let { model, maxtoken, temperature, endpoint, engine, version, embedding } = setting || {};
     switch (provider) {
         case GptProviderEnum.OPENAI: 
-            return new OpenAIGpt(apikey+'', { model, maxtoken, temperature });
+            return new OpenAIGpt(apikey + '', { model, maxtoken, temperature, embedding });
         case GptProviderEnum.MICROSOFT: 
-            return new AzureAI(apikey+'', { endpoint, engine, version }, { model, maxtoken, temperature }, );
+            return new AzureAI(apikey + '', { endpoint, engine, version }, { model, maxtoken, temperature, embedding }, );
         case GptProviderEnum.BAIDU:
             let cred: ApiCredential = typeof (apikey) === 'string' ? { apikey, securitykey: apikey } : apikey
             return new BaiduWenXinAI(cred);

package/src/openai.ts

@@ -1,4 +1,4 @@
-import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "openai"
+import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "azure-openai"
 // import { EventEmitter } from "events";
 import GptBase from "./gptbase"
 import { OpenAIApiParameters, ChatReponse, OutlineSummaryItem, SummaryReponse, FaqItem, ExaminationPaperResult, EmotionResult, SimilarityResult, QuestionItem, CommentResult, EmbeddingResult } from './declare'
@@ -16,10 +16,11 @@ const QUESTION_TYPE: string[] = ['singlechoice', 'multiplechoice', 'trueorfalse'
 
 export default class OpenAIGpt extends GptBase {
     protected readonly apiKey: string;
-    private aiApi: OpenAIApi | undefined;
+    protected aiApi: OpenAIApi | undefined;
     protected readonly chatModel: string;
     protected readonly maxtoken: number;
     protected readonly temperature: number;
+    protected readonly embeddingmodel:string;       
     /**
      * 
      * @param apiKey 调用OpenAI 的key
@@ -27,10 +28,12 @@ export default class OpenAIGpt extends GptBase {
      */
     constructor(apiKey: string, apiOption: OpenAIApiParameters = {}) {
         super();
+
         this.apiKey = apiKey;
         this.chatModel = apiOption.model || 'gpt-3.5-turbo';
         this.maxtoken = apiOption.maxtoken || 2048;
         this.temperature = apiOption.temperature || 0.9;
+        this.embeddingmodel = apiOption.embedding || 'text-embedding-ada-002';
     }
     /**
      * 初始化OpenAI 的聊天对象Api
@@ -48,15 +51,14 @@ export default class OpenAIGpt extends GptBase {
         if (!this.aiApi) {
             this.aiApi = this.createOpenAI(this.apiKey);
         }
-        // console.log('message', message)
         try {
             const response:any = await this.aiApi.createEmbedding({
-                model:'text-embedding-ada-002',
+                model: this.embeddingmodel,
                 input: text,
             }, axiosOption);
             return { successed: true, embedding: response.data.data[0].embedding };
         } catch (error) {
-            console.log('result is error ', error)
+            // console.log('result is error ', error)
             return { successed: false, error };
         }
     }
@@ -75,20 +77,67 @@ export default class OpenAIGpt extends GptBase {
             [{ role: 'user', content: chatText }] : chatText;
         // console.log('message', message)
         try {
-            const response = await this.aiApi.createChatCompletion({
+            const response:any = await this.aiApi.createChatCompletion({
                 model: callChatOption?.model || this.chatModel,
                 messages: message,
                 temperature: Number(callChatOption?.temperature || this.temperature),
                 max_tokens: Number(callChatOption?.maxtoken || this.maxtoken),
                 n: Number(callChatOption?.replyCounts || 1) || 1
             }, axiosOption);
-            return { successed: true, message: response.data.choices };
+            return { successed: true, message: response.data.choices, usage: response.data.usage };
         } catch (error) {
             console.log('result is error ', error)
             return { successed: false, error };
         }
 
     }
+    /**
+     * 流式的聊天模式
+     * @param chatText 
+     * @param _paramOption 
+     * @param axiosOption 
+     */
+    async chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: any):Promise<void>{
+        if (!chatText) this.emit('chaterror', { successed: false, error:'no text in chat'});
+        if (!this.aiApi) {
+            this.aiApi = this.createOpenAI(this.apiKey);
+        }
+        let message: Array<ChatCompletionRequestMessage> = typeof (chatText) == 'string' ?
+            [{ role: 'user', content: chatText }] : chatText;
+        axiosOption = Object.assign({}, axiosOption || { timeout: 60000 }, { responseType: 'stream' })
+        try {
+            let finishreason:any = null,usage:any = null;
+            const response: any = await this.aiApi.createChatCompletion({
+                model: callChatOption?.model || this.chatModel,
+                messages: message,
+                stream:true,
+                temperature: Number(callChatOption?.temperature || this.temperature),
+                max_tokens: Number(callChatOption?.maxtoken || this.maxtoken)
+            }, axiosOption);
+            response.data.on('data', (data:any) => {
+                const lines = data.toString().split('\n').filter((line:string) => line.trim() !== '');
+                for (const line of lines) {
+                    const message = line.replace(/^data: /, '');
+                    if (message === '[DONE]') {
+                        this.emit('chatdone', { successed: true, finish_reason: finishreason, usage })
+                        return; // Stream finished
+                    }
+                    try {
+                        ///{ delta: { content: '$\\' }, index: 0, finish_reason: null }
+                        ///发送出去
+                        const parsed = JSON.parse(message);
+                        finishreason = parsed.choices[0].finish_reason;
+                        usage = parsed.usage;
+                        this.emit('chattext', { successed: true, text: parsed.choices[0].delta.content, finish_reason: parsed.choices[0].finish_reason, index: parsed.choices[0].index, usage})
+                    } catch (error) {
+                        this.emit('chaterror', { successed: false, error: 'JSON parse stream message', message });
+                    }
+                }
+            });
+        } catch (error) {
+            this.emit('error', { successed: false, error: 'call axios faied ' + error });
+        }
+    }
 
     /**
      * 点评问题回答的评价