doomiaichat 3.2.0 → 3.4.0

package/dist/baiduai.d.ts

@@ -23,7 +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;
+    chatRequestInStream(_chatText: string | any[], _paramOption: any, _attach?: 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,7 +97,7 @@ class BaiduWenXinAI extends gptbase_1.default {
             }
         });
     }
-    chatRequestInStream(_chatText, _paramOption, _axiosOption) {
+    chatRequestInStream(_chatText, _paramOption, _attach, _axiosOption) {
         throw new Error("Method not implemented.");
     }
     commentQuestionAnswer(_question, _answer, _axiosOption) {

package/dist/gptbase.d.ts

@@ -17,14 +17,14 @@ export default abstract class GptBase extends EventEmitter {
      * @param _paramOption
      * @param axiosOption
      */
-    abstract chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any): Promise<ApiResult>;
+    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): any;
+    abstract chatRequestInStream(chatText: string | Array<any>, _paramOption: any, attach?: any, axiosOption?: any): any;
     /**
      * 点评问题回答的评价
      * @param question  问题题干

package/dist/openai.d.ts

@@ -34,7 +34,7 @@ export default class OpenAIGpt extends GptBase {
      * @param _paramOption
      * @param axiosOption
      */
-    chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: any): Promise<any>;
+    chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, attach?: any, axiosOption?: any): Promise<any>;
     /**
      * 点评问题回答的评价
      * @param question

package/dist/openai.js

@@ -106,7 +106,7 @@ class OpenAIGpt extends gptbase_1.default {
      * @param _paramOption
      * @param axiosOption
      */
-    chatRequestInStream(chatText, callChatOption, axiosOption) {
+    chatRequestInStream(chatText, callChatOption, attach, axiosOption) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!chatText)
                 this.emit('chaterror', { successed: false, error: 'no text in chat' });
@@ -120,6 +120,7 @@ class OpenAIGpt extends gptbase_1.default {
             try {
                 let finishreason = null, usage = null;
                 ///便于知道返回的requestid
+                // console.log('model', callChatOption?.model || this.chatModel,)
                 const response = yield this.aiApi.createChatCompletion({
                     model: (callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.model) || this.chatModel,
                     messages: message,
@@ -133,7 +134,10 @@ class OpenAIGpt extends gptbase_1.default {
                     for (const line of lines) {
                         const message = line.replace(/^data: /, '');
                         if (message === '[DONE]') {
-                            this.emit('chatdone', { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, usage });
+                            let output = { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, usage };
+                            if (attach)
+                                output = Object.assign(output, attach);
+                            this.emit('chatdone', output);
                             return; // Stream finished
                         }
                         try {
@@ -144,7 +148,10 @@ class OpenAIGpt extends gptbase_1.default {
                             usage = parsed.usage;
                             let streamtext = parsed.choices[0].delta.content;
                             replytext.push(streamtext);
-                            this.emit('chattext', { successed: true, requestid, text: streamtext, finish_reason: parsed.choices[0].finish_reason, index: parsed.choices[0].index, usage });
+                            let output = { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, index: parsed.choices[0].index, usage };
+                            if (attach)
+                                output = Object.assign(output, attach);
+                            this.emit('chattext', attach);
                         }
                         catch (error) {
                             this.emit('chaterror', { successed: false, requestid, error: 'JSON parse stream message', message });
@@ -154,7 +161,7 @@ class OpenAIGpt extends gptbase_1.default {
                 return { successed: true, requestid };
             }
             catch (error) {
-                // this.emit('error', { successed: false, requestid, error: 'call axios faied ' + error });
+                this.emit('requesterror', { successed: false, requestid, error: 'call axios faied ' + error });
                 return { successed: false, requestid };
             }
         });

package/package.json

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

package/src/baiduai.ts

@@ -83,7 +83,7 @@ export default class BaiduWenXinAI extends GptBase {
 
     }
 
-    chatRequestInStream(_chatText: string | any[], _paramOption: any, _axiosOption: any): void {
+    chatRequestInStream(_chatText: string | any[], _paramOption: any,_attach?:any, _axiosOption?: any): void {
         throw new Error("Method not implemented.");
     }
     commentQuestionAnswer(_question: string, _answer: string, _axiosOption: any): Promise<CommentResult>{

package/src/gptbase.ts

@@ -19,14 +19,14 @@ export default abstract class GptBase extends EventEmitter {
      * @param _paramOption 
      * @param axiosOption 
      */
-    abstract chatRequest(chatText: string | Array<any>, _paramOption: any, axiosOption: any): Promise<ApiResult>;
+    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):any;
+    abstract chatRequestInStream(chatText: string | Array<any>, _paramOption: any,attach?:any, axiosOption?: any):any;
     /**
      * 点评问题回答的评价
      * @param question  问题题干

package/src/openai.ts

@@ -97,7 +97,7 @@ export default class OpenAIGpt extends GptBase {
      * @param _paramOption 
      * @param axiosOption 
      */
-    async chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, axiosOption: any):Promise<any>{
+    async chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, attach?: any, axiosOption?: any):Promise<any>{
         if (!chatText) this.emit('chaterror', { successed: false, error:'no text in chat'});
         if (!this.aiApi) {
             this.aiApi = this.createOpenAI(this.apiKey);
@@ -109,7 +109,7 @@ export default class OpenAIGpt extends GptBase {
         try {
             let finishreason:any = null,usage:any = null;
             ///便于知道返回的requestid
-           
+            // console.log('model', callChatOption?.model || this.chatModel,)
             const response: any = await this.aiApi.createChatCompletion({
                 model: callChatOption?.model || this.chatModel,
                 messages: message,
@@ -123,7 +123,9 @@ export default class OpenAIGpt extends GptBase {
                 for (const line of lines) {
                     const message = line.replace(/^data: /, '');
                     if (message === '[DONE]') {
-                        this.emit('chatdone', { successed: true, requestid,text: replytext.join(''), finish_reason: finishreason, usage })
+                        let output = { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, usage };
+                        if (attach) output = Object.assign(output, attach);
+                        this.emit('chatdone', output)
                         return; // Stream finished
                     }
                     try {
@@ -133,8 +135,10 @@ export default class OpenAIGpt extends GptBase {
                         finishreason = parsed.choices[0].finish_reason;
                         usage = parsed.usage;
                         let streamtext = parsed.choices[0].delta.content;
-                        replytext.push(streamtext)
-                        this.emit('chattext', { successed: true, requestid, text: streamtext, finish_reason: parsed.choices[0].finish_reason, index: parsed.choices[0].index, usage})
+                        replytext.push(streamtext);
+                        let output = { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, index: parsed.choices[0].index, usage };
+                        if (attach) output = Object.assign(output, attach);
+                        this.emit('chattext', attach )
                     } catch (error) {
                         this.emit('chaterror', { successed: false, requestid, error: 'JSON parse stream message', message });
                     }
@@ -142,7 +146,7 @@ export default class OpenAIGpt extends GptBase {
             });
             return { successed: true, requestid }
         } catch (error) {
-            // this.emit('error', { successed: false, requestid, error: 'call axios faied ' + error });
+            this.emit('requesterror', { successed: false, requestid, error: 'call axios faied ' + error });
             return { successed: false, requestid }
         }
     }