doomiaichat 5.1.0 → 6.0.0

package/dist/azureai.d.ts

@@ -1,20 +1,34 @@
-import { OpenAIApi } from "azure-openai";
-import { AzureOpenAIPatameters, EmbeddingResult, OpenAIApiParameters } from "./declare";
-import OpenAIGpt from "./openai";
-export default class AzureAI extends OpenAIGpt {
+/**
+ * 微软AZure OpenAI
+ */
+import OpenAIBase from "./openaibase";
+import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters } from "./declare";
+import { OpenAIClient } from "@azure/openai";
+export default class AzureAI extends OpenAIBase<OpenAIClient> {
     protected readonly azureSetting: AzureOpenAIPatameters;
     constructor(apiKey: string, azureOption: AzureOpenAIPatameters, apiOption?: OpenAIApiParameters);
     /**
      * 初始化OpenAI 的聊天对象Api
      */
-    createOpenAI(apiKey: string): OpenAIApi;
-    /**
-     * ZAure OpenAI 最新的URL地址
-     */
+    createOpenAI(apiKey: string): OpenAIClient;
     get EmbeddingUrl(): string;
     /**
      * 获得文字的向量
      * @param text
      */
     getTextEmbedding(text: string, axiosOption?: any): Promise<EmbeddingResult>;
+    /**
+     * 非流式聊天请求
+     * @param _chatText
+     * @param _paramOption
+     * @param _axiosOption
+     */
+    chatRequest(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, _axiosOption?: any): Promise<ChatReponse>;
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
+    chatRequestInStream(chatText: string | Array<any>, callChatOption: OpenAIApiParameters, attach?: any, axiosOption?: any): Promise<any>;
 }

package/dist/azureai.js

@@ -8,15 +8,24 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 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");
+/**
+ * 微软AZure OpenAI
+ */
+const openaibase_1 = __importDefault(require("./openaibase"));
 const declare_1 = require("./declare");
-// import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "azure-openai"
-const openai_1 = __importDefault(require("./openai"));
-class AzureAI extends openai_1.default {
+const openai_1 = require("@azure/openai");
+class AzureAI extends openaibase_1.default {
     constructor(apiKey, azureOption, apiOption = {}) {
         super(apiKey, apiOption);
         this.azureSetting = azureOption;
@@ -28,19 +37,8 @@ class AzureAI extends openai_1.default {
      * 初始化OpenAI 的聊天对象Api
      */
     createOpenAI(apiKey) {
-        return new azure_openai_1.OpenAIApi(new azure_openai_1.Configuration({ apiKey,
-            azure: {
-                apiKey,
-                endpoint: this.azureSetting.endpoint,
-                deploymentName: this.azureSetting.engine
-            } }));
+        return new openai_1.OpenAIClient(this.azureSetting.endpoint, new openai_1.AzureKeyCredential(apiKey));
     }
-    /**
-     * 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.embeddingmodel || 'openai-embedding-ada-002'}/embeddings?api-version=2022-12-01`;
     }
@@ -63,7 +61,7 @@ class AzureAI extends openai_1.default {
                         input: text
                     }, url: this.EmbeddingUrl });
                 const response = yield (0, declare_1.request)(param);
-                if (response.data) {
+                if (response.successed && response.data) {
                     return { successed: true, embedding: response.data.data[0].embedding };
                 }
                 return Object.assign({ successed: false }, response.data);
@@ -73,5 +71,111 @@ class AzureAI extends openai_1.default {
             }
         });
     }
+    /**
+     * 非流式聊天请求
+     * @param _chatText
+     * @param _paramOption
+     * @param _axiosOption
+     */
+    chatRequest(chatText, callChatOption, _axiosOption = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!chatText)
+                return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
+            if (!this.aiApi)
+                this.aiApi = this.createOpenAI(this.apiKey);
+            let message = typeof (chatText) == 'string' ?
+                [{ role: 'user', content: chatText }] : chatText;
+            try {
+                const response = yield this.aiApi.getChatCompletions((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.model) || this.chatModel, message, {
+                    temperature: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.temperature) || this.temperature),
+                    maxTokens: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.maxtoken) || this.maxtoken),
+                    topP: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.top_p) || this.top_p),
+                    presencePenalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.presence_penalty) || this.presence_penalty),
+                    frequencyPenalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.frequency_penalty) || this.frequency_penalty),
+                    n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1,
+                    tools: callChatOption.tools,
+                    toolChoice: (callChatOption.tool_choice || 'none'),
+                });
+                const { promptTokens: prompt_tokens, completionTokens: completion_tokens, totalTokens: total_tokens } = response.usage;
+                let rebuildChoice = [];
+                for (const msg of response.choices) {
+                    ///, contentFilterResults: content_filter 
+                    const { index, finishReason: finish_reason, message } = msg;
+                    rebuildChoice.push({ index, finish_reason, message });
+                }
+                return { successed: true, message: rebuildChoice, usage: { prompt_tokens, completion_tokens, total_tokens } };
+            }
+            catch (error) {
+                console.log('result is error ', error);
+                return { successed: false, error };
+            }
+        });
+    }
+    /**
+     * 流式的聊天模式
+     * @param chatText
+     * @param _paramOption
+     * @param axiosOption
+     */
+    chatRequestInStream(chatText, callChatOption, attach, axiosOption) {
+        var _a, e_1, _b, _c;
+        var _d;
+        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 });
+            let requestid = Math.ceil(Math.random() * (new Date().getTime() * Math.random()) / 1000);
+            try {
+                const response = yield this.aiApi.streamChatCompletions((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.model) || this.chatModel, message, {
+                    temperature: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.temperature) || this.temperature),
+                    maxTokens: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.maxtoken) || this.maxtoken),
+                    topP: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.top_p) || this.top_p),
+                    presencePenalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.presence_penalty) || this.presence_penalty),
+                    frequencyPenalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.frequency_penalty) || this.frequency_penalty),
+                    n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1
+                });
+                let replytext = [];
+                try {
+                    for (var _e = true, response_1 = __asyncValues(response), response_1_1; response_1_1 = yield response_1.next(), _a = response_1_1.done, !_a;) {
+                        _c = response_1_1.value;
+                        _e = false;
+                        try {
+                            const event = _c;
+                            for (const choice of event.choices) {
+                                const { finishReason: finishreason, index } = choice;
+                                const content = (_d = choice.delta) === null || _d === void 0 ? void 0 : _d.content;
+                                if (!content)
+                                    continue;
+                                replytext.push(content);
+                                let output = { successed: true, requestid, segment: content, text: replytext.join(''), finish_reason: finishreason, index }; //, usage };
+                                if (attach)
+                                    output = Object.assign({}, output, attach);
+                                this.emit(finishreason ? 'chatdone' : 'chattext', output);
+                            }
+                        }
+                        finally {
+                            _e = true;
+                        }
+                    }
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (!_e && !_a && (_b = response_1.return)) yield _b.call(response_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                return { successed: true, requestid };
+            }
+            catch (error) {
+                this.emit('requesterror', { successed: false, requestid, error: 'call axios faied ' + error });
+                return { successed: false, requestid };
+            }
+        });
+    }
 }
 exports.default = AzureAI;

package/dist/declare.d.ts

@@ -35,10 +35,18 @@ export interface OpenAIApiParameters {
     'presence_penalty'?: number;
     'frequency_penalty'?: number;
     'replyCounts'?: number;
+    'tools'?: Array<any>;
+    'tool_choice'?: string;
 }
 /**
  * Azure 上的OpenAI的链接参数
  */
+export interface ProxyPatameters {
+    'serviceurl': string;
+}
+/**
+ * OpenAI Proxy 链接参数
+ */
 export interface AzureOpenAIPatameters {
     'endpoint': string;
     'engine': string;
@@ -84,3 +92,22 @@ export interface CacheProvider {
      */
     delete(key: string): void;
 }
+export interface StabilityOption {
+    'cfg_scale'?: number;
+    'clip_guidance_preset'?: string;
+    'height'?: number;
+    'width'?: number;
+    'samples'?: number;
+    'seed'?: number;
+    'steps'?: number;
+    'sampler'?: string;
+    'negative'?: string;
+    'engine'?: string;
+    'endpoint'?: string;
+    'denoising_strength'?: number;
+    'hr_scale'?: number;
+}
+export interface StabilityResult extends ApiResult {
+    'data'?: any;
+    'type'?: string;
+}

package/dist/gptprovider.d.ts

@@ -5,6 +5,7 @@ import GptBase from './gptbase';
  */
 export declare const GptProviderEnum: {
     readonly OPENAI: "openai";
+    readonly OPENAIPROXY: "openaiproxy";
     readonly MICROSOFT: "microsoft";
     readonly BAIDU: "baidu";
     readonly GOOGLE: "google";

package/dist/gptprovider.js

@@ -9,6 +9,7 @@ exports.createGpt = exports.GptProviderEnum = void 0;
 * 语音转文字服务商工厂
 */
 const openai_1 = __importDefault(require("./openai"));
+const openaiproxy_1 = __importDefault(require("./openaiproxy"));
 const azureai_1 = __importDefault(require("./azureai"));
 const stabilityai_1 = __importDefault(require("./stabilityai"));
 const stabilityplusai_1 = __importDefault(require("./stabilityplusai"));
@@ -18,6 +19,7 @@ const baiduai_1 = __importDefault(require("./baiduai"));
  */
 exports.GptProviderEnum = {
     OPENAI: 'openai',
+    OPENAIPROXY: 'openaiproxy',
     MICROSOFT: 'microsoft',
     BAIDU: 'baidu',
     GOOGLE: 'google',
@@ -32,10 +34,12 @@ exports.GptProviderEnum = {
  * @returns
  */
 function createGpt(provider, apikey, setting) {
-    let { model, maxtoken, temperature, endpoint, engine, version, embedding, top_p, presence_penalty, frequency_penalty } = setting || {};
+    let { model, maxtoken, temperature, serviceurl, endpoint, engine, version, embedding, top_p, presence_penalty, frequency_penalty } = setting || {};
     switch (provider) {
         case exports.GptProviderEnum.OPENAI:
             return new openai_1.default(apikey + '', { model, maxtoken, temperature, embedding, top_p, presence_penalty, frequency_penalty });
+        case exports.GptProviderEnum.OPENAIPROXY:
+            return new openaiproxy_1.default(apikey + '', { serviceurl }, { model, maxtoken, temperature, embedding, top_p, presence_penalty, frequency_penalty });
         case exports.GptProviderEnum.MICROSOFT:
             return new azureai_1.default(apikey + '', { endpoint, engine, version }, { model, maxtoken, temperature, embedding, top_p, presence_penalty, frequency_penalty });
         case exports.GptProviderEnum.BAIDU:

package/dist/openai.d.ts

@@ -1,26 +1,14 @@
-import { OpenAIApi } from "azure-openai";
-import GptBase from "./gptbase";
+/**
+ * OpenAI
+ */
+import OpenAIBase from "./openaibase";
 import { OpenAIApiParameters, ChatReponse, EmbeddingResult } from './declare';
-export default class OpenAIGpt extends GptBase {
-    protected readonly apiKey: string;
-    protected aiApi: OpenAIApi | undefined;
-    protected readonly chatModel: string;
-    protected readonly maxtoken: number;
-    protected readonly top_p: number;
-    protected readonly presence_penalty: number;
-    protected readonly frequency_penalty: number;
-    protected readonly temperature: number;
-    protected readonly embeddingmodel: string;
-    /**
-     *
-     * @param apiKey 调用OpenAI 的key
-     * @param apiOption
-     */
-    constructor(apiKey: string, apiOption?: OpenAIApiParameters);
+import OpenAI from "openai";
+export default class OpenAIGpt extends OpenAIBase<OpenAI> {
     /**
      * 初始化OpenAI 的聊天对象Api
      */
-    createOpenAI(apiKey: string): OpenAIApi;
+    createOpenAI(apiKey: string): OpenAI;
     /**
      * 获得文字的向量
      * @param text

package/dist/openai.js

@@ -8,34 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 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 gptbase_1 = __importDefault(require("./gptbase"));
-class OpenAIGpt extends gptbase_1.default {
-    /**
-     *
-     * @param apiKey 调用OpenAI 的key
-     * @param apiOption
-     */
-    constructor(apiKey, apiOption = {}) {
-        super();
-        this.apiKey = apiKey;
-        this.chatModel = apiOption.model || 'gpt-3.5-turbo';
-        this.maxtoken = apiOption.maxtoken || 2048;
-        this.top_p = apiOption.top_p || 0.95;
-        this.temperature = apiOption.temperature || 0.9;
-        this.presence_penalty = apiOption.presence_penalty || 0;
-        this.frequency_penalty = apiOption.frequency_penalty || 0;
-        this.embeddingmodel = apiOption.embedding || 'text-embedding-ada-002';
-    }
+// import { Configuration, OpenAIApi, ChatCompletionRequestMessage } from "azure-openai"
+/**
+ * OpenAI
+ */
+const openaibase_1 = __importDefault(require("./openaibase"));
+const openai_1 = __importDefault(require("openai"));
+class OpenAIGpt extends openaibase_1.default {
     /**
      * 初始化OpenAI 的聊天对象Api
      */
     createOpenAI(apiKey) {
-        return new azure_openai_1.OpenAIApi(new azure_openai_1.Configuration({ apiKey }));
+        return new openai_1.default({ apiKey });
     }
     /**
      * 获得文字的向量
@@ -49,7 +44,8 @@ class OpenAIGpt extends gptbase_1.default {
                 this.aiApi = this.createOpenAI(this.apiKey);
             }
             try {
-                const response = yield this.aiApi.createEmbedding({
+                //const response: any = await this.aiApi.createEmbedding({
+                const response = yield this.aiApi.embeddings.create({
                     model: this.embeddingmodel,
                     input: text,
                 }, axiosOption);
@@ -69,15 +65,13 @@ class OpenAIGpt extends gptbase_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             if (!chatText)
                 return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
-            if (!this.aiApi) {
+            if (!this.aiApi)
                 this.aiApi = this.createOpenAI(this.apiKey);
-                //return { successed: false, error: { errcode: 1, errmsg: '聊天机器人无效' } };
-            }
             let message = typeof (chatText) == 'string' ?
                 [{ role: 'user', content: chatText }] : chatText;
-            // console.log('message', message)
             try {
-                const response = yield this.aiApi.createChatCompletion({
+                // const response: any = await this.aiApi.createChatCompletion({
+                const response = yield this.aiApi.chat.completions.create({
                     model: (callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.model) || this.chatModel,
                     messages: message,
                     temperature: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.temperature) || this.temperature),
@@ -85,14 +79,10 @@ class OpenAIGpt extends gptbase_1.default {
                     top_p: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.top_p) || this.top_p),
                     presence_penalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.presence_penalty) || this.presence_penalty),
                     frequency_penalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.frequency_penalty) || this.frequency_penalty),
-                    n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1
+                    n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1,
+                    tools: callChatOption.tools,
+                    tool_choice: (callChatOption.tool_choice || 'none'),
                 }, 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) {
@@ -108,6 +98,7 @@ class OpenAIGpt extends gptbase_1.default {
      * @param axiosOption
      */
     chatRequestInStream(chatText, callChatOption, attach, axiosOption) {
+        var _a, e_1, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             if (!chatText)
                 this.emit('chaterror', { successed: false, error: 'no text in chat' });
@@ -117,65 +108,87 @@ class OpenAIGpt extends gptbase_1.default {
             // const DATA_END_TAG = `"usage":null}`
             let message = typeof (chatText) == 'string' ?
                 [{ role: 'user', content: chatText }] : chatText;
-            axiosOption = Object.assign({}, axiosOption || { timeout: 60000 }, { responseType: 'stream' });
+            //axiosOption = Object.assign({}, axiosOption || { timeout: 60000 }, { responseType: 'stream' })
+            axiosOption = Object.assign({}, axiosOption || { timeout: 60000 });
             let requestid = Math.ceil(Math.random() * (new Date().getTime() * Math.random()) / 1000);
             try {
-                let finishreason = null, usage = null, errtxt = '';
+                // let finishreason: any = null, usage: any = null,errtxt = '';
                 ///便于知道返回的requestid
                 // console.log('model', callChatOption?.model || this.chatModel,)
-                const response = yield this.aiApi.createChatCompletion({
+                //const response: any = await this.aiApi.chat.completions.create({
+                const response = yield this.aiApi.chat.completions.create({
                     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),
                     top_p: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.top_p) || this.top_p),
                     presence_penalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.presence_penalty) || this.presence_penalty),
                     frequency_penalty: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.frequency_penalty) || this.frequency_penalty),
-                    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)
+                    n: Number((callChatOption === null || callChatOption === void 0 ? void 0 : callChatOption.replyCounts) || 1) || 1,
+                    stream: true
                 }, axiosOption);
                 let replytext = [];
-                response.data.on('data', (data) => {
-                    const lines = data.toString().split('\n').filter((line) => line.trim() !== '');
-                    ///已经返回了结束原因
-                    if (finishreason)
-                        return;
-                    // console.log('before add', lines.join('').split('data:'));
-                    let alltext = (errtxt + lines.join('')).split('data:');
-                    // console.log('alltext',alltext)
-                    errtxt = '';
-                    for (const line of alltext) {
-                        let txt = line.trim();
-                        if (!txt)
-                            continue;
-                        if (txt === '[DONE]') {
-                            let output = { successed: true, requestid, text: replytext.join(''), finish_reason: 'stop', usage };
-                            if (attach)
-                                output = Object.assign({}, output, attach);
-                            this.emit('chatdone', output);
-                            return; // Stream finished
-                        }
+                try {
+                    for (var _d = true, response_1 = __asyncValues(response), response_1_1; response_1_1 = yield response_1.next(), _a = response_1_1.done, !_a;) {
+                        _c = response_1_1.value;
+                        _d = false;
                         try {
-                            ///{ delta: { content: '$\\' }, index: 0, finish_reason: null }
-                            ///发送出去
-                            const parsed = JSON.parse(txt);
-                            ///已经返回一个正确的了，可以重置这个变量了
-                            finishreason = parsed.choices[0].finish_reason;
-                            usage = parsed.usage;
-                            let streamtext = parsed.choices[0].delta.content;
-                            replytext.push(streamtext);
-                            let output = { successed: true, requestid, text: replytext.join(''), finish_reason: finishreason, index: parsed.choices[0].index, usage };
+                            const chunk = _c;
+                            const [choice] = chunk.choices, { content, finishreason, index, usage } = choice.delta;
+                            if (!content)
+                                continue;
+                            replytext.push(content);
+                            let output = { successed: true, requestid, segment: content, text: replytext.join(''), finish_reason: finishreason, index, usage };
                             if (attach)
                                 output = Object.assign({}, output, attach);
                             this.emit(finishreason ? 'chatdone' : 'chattext', output);
-                            if (finishreason)
-                                return;
                         }
-                        catch (error) {
-                            errtxt += txt; ///这一段json没有结束，作为下一次的流过来时使用
-                            this.emit('chaterror', { successed: false, requestid, error: 'JSON parse stream message', errtxt });
+                        finally {
+                            _d = true;
                         }
                     }
-                });
+                }
+                catch (e_1_1) { e_1 = { error: e_1_1 }; }
+                finally {
+                    try {
+                        if (!_d && !_a && (_b = response_1.return)) yield _b.call(response_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                }
+                // response.data.on('data', (data: any) => {
+                //     const lines = data.toString().split('\n').filter((line: string) => line.trim() !== '');
+                //     ///已经返回了结束原因
+                //     if (finishreason) return;
+                //     let alltext = (errtxt +lines.join('')).split('data:');
+                //     errtxt = '';
+                //     for (const line of alltext) {
+                //         let txt = line.trim();
+                //         if (!txt) continue;
+                //         if (txt === '[DONE]') {
+                //             let output = { successed: true, requestid, text: replytext.join(''), finish_reason: 'stop', usage };
+                //             if (attach) output = Object.assign({}, output, attach);
+                //             this.emit('chatdone', output)
+                //             return; // Stream finished
+                //         }
+                //         try {
+                //             ///{ delta: { content: '$\\' }, index: 0, finish_reason: null }
+                //             ///发送出去
+                //             const parsed = JSON.parse(txt);
+                //             ///已经返回一个正确的了，可以重置这个变量了
+                //             finishreason = parsed.choices[0].finish_reason;
+                //             usage = parsed.usage;
+                //             let streamtext = parsed.choices[0].delta.content;
+                //             replytext.push(streamtext);
+                //             let output = { successed: true, requestid, segment: streamtext, text: replytext.join(''), finish_reason: finishreason, index: parsed.choices[0].index, usage };
+                //             if (attach) output = Object.assign({}, output, attach);
+                //             this.emit(finishreason ? 'chatdone' : 'chattext', output)
+                //             if (finishreason) return;
+                //         } catch (error) {
+                //             errtxt+=txt;  ///这一段json没有结束，作为下一次的流过来时使用
+                //             this.emit('chaterror', { successed: false, requestid, error: 'JSON parse stream message', errtxt });
+                //         }
+                //     }
+                // });
                 return { successed: true, requestid };
             }
             catch (error) {

package/dist/openaibase.d.ts

@@ -0,0 +1,18 @@
+import { OpenAIApiParameters } from "./declare";
+import GptBase from "./gptbase";
+export default abstract class OpenAIBase<T> extends GptBase {
+    protected readonly apiKey: string;
+    protected readonly chatModel: string;
+    protected readonly maxtoken: number;
+    protected readonly top_p: number;
+    protected readonly presence_penalty: number;
+    protected readonly frequency_penalty: number;
+    protected readonly temperature: number;
+    protected readonly embeddingmodel: string;
+    protected aiApi: T | undefined;
+    constructor(apiKey: string, apiOption?: OpenAIApiParameters);
+    /**
+     * 初始化OpenAI 的聊天对象Api
+     */
+    abstract createOpenAI(apiKey: string): T;
+}

package/dist/openaibase.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const gptbase_1 = __importDefault(require("./gptbase"));
+class OpenAIBase extends gptbase_1.default {
+    constructor(apiKey, apiOption = {}) {
+        super();
+        this.apiKey = apiKey;
+        this.chatModel = apiOption.model || 'gpt-3.5-turbo';
+        this.maxtoken = apiOption.maxtoken || 2048;
+        this.top_p = apiOption.top_p || 0.95;
+        this.temperature = apiOption.temperature || 0.9;
+        this.presence_penalty = apiOption.presence_penalty || 0;
+        this.frequency_penalty = apiOption.frequency_penalty || 0;
+        this.embeddingmodel = apiOption.embedding || 'text-embedding-ada-002';
+    }
+}
+exports.default = OpenAIBase;

package/dist/openaiproxy.d.ts

@@ -0,0 +1,21 @@
+import { ApiResult, OpenAIApiParameters, ProxyPatameters } from './declare';
+import OpenAIGpt from './openai';
+export default class OpenAIProxy extends OpenAIGpt {
+    protected readonly proxySetting: ProxyPatameters;
+    constructor(apiKey: string, proxyOption: ProxyPatameters, apiOption?: OpenAIApiParameters);
+    /**
+     * 重写chatRequest方法
+     * @param chatText
+     * @param callChatOption
+     * @param axiosOption
+     */
+    chatRequest(chatText: string | any[], _paramOption: any, axiosOption?: any): Promise<ApiResult>;
+    /**
+     * 重写chatRequestInStream方法
+     * @param chatText
+     * @param callChatOption
+     * @param attach
+     * @param axiosOption
+     */
+    chatRequestInStream(chatText: Array<any>, callChatOption: OpenAIApiParameters, attach?: any, axiosOption?: any): Promise<any>;
+}