doomiaichat 7.1.29 → 7.1.30

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "doomiaichat",
-  "version": "7.1.29",
+  "version": "7.1.30",
   "description": "Doomisoft OpenAI",
   "main": "dist/index.js",
+  "files": ["dist"],
   "scripts": {
     "build": "tsc"
   },
@@ -18,7 +19,7 @@
   "dependencies": {
     "@azure/openai": "^1.0.0-beta.11",
     "@coze/api": "^1.3.6",
-    "axios": "^1.8.4",
+    "axios": "^1.12.0",
     "openai": "^5.19.1"
   }
 }

package/src/aimp.ts

@@ -1,125 +0,0 @@
-/**
- * 接入AI平台的中间层
- */
-import axios from 'axios';
-import { request } from "./declare";
-import GptBase from "./gptbase"
-import { Readable } from 'stream';
-// import { ChatReponse } from './declare';
-export default class AIMiddlePlatform extends GptBase {
-
-    protected apikey: string;
-    protected agent: { endpoint: string, agentid: string };
-    /**
-     * 
-     * @param apikey 调用AI中台 的key
-     * @param agent  智能体信息 
-     */
-    constructor(apikey: string, agent: { endpoint: string, agentid: string }) {
-        super();
-        this.apikey = apikey;
-        this.agent = agent;
-    }
-
-    /**
-      * 非流式传输聊天请求
-      * @param chatText 
-      * @param callChatOption 
-      * @param axiosOption 
-      */
-    public async chatRequest(chatText: string | any, callChatOption: any, axiosOption: any = {}): Promise<any> {
-        if (!chatText) {
-            // this.emit('chaterror', { successed: false, error: 'no text in chat' });
-            return { successed: false, error: 'no text in chat' };
-        }
-        const question = typeof chatText === 'object' ? chatText.text ?? chatText.content : chatText;
-        axiosOption = Object.assign({}, axiosOption || { timeout: 60000 })
-        const opts: any = {
-            headers: {
-                'Content-Type': 'application/json',
-                'authorization': `Bearer ${this.apikey}`
-            },
-            method: 'post',
-            url: `${this.agent.endpoint}/api/v1/agents/${this.agent.agentid}/completions`,
-            data: {
-                question,
-                session_id: callChatOption.session_id,
-                optional: callChatOption.optional,
-                stream: false
-            },
-            ...axiosOption
-        }
-        const response = await request(opts);
-        if (!response.successed || response.data.code) return { successed: false, error: 'failed' };
-        const {answer:message,session_id} = response.data.data;
-        // this.emit('chatdone', { successed: true, segment: message, text: message, finish_reason: 'stop', index: 0, session_id })
-        return { successed: true, message:[{message:{content:message}}],session_id };
-    }
-    /**
-     * 流式传输聊天请求
-     * @param chatText 
-     * @param callChatOption 
-     * @param attach 
-     * @param axiosOption 
-     * @returns 
-     */
-    override async chatRequestInStream(chatText: string | any, callChatOption: any, attach?: any, axiosOption?: any): Promise<any> {
-        if (!chatText) this.emit('chaterror', { successed: false, error: 'no text in chat' });
-        // console.log('Question===>', chatText)
-        const question = typeof chatText === 'object' ? chatText.text??chatText.content : chatText;
-        axiosOption = Object.assign({}, axiosOption || { timeout: 60000 })
-        let requestid = Math.ceil(Math.random() * (new Date().getTime() * Math.random()) / 1000);
-        try {
-            const opts: any = {
-                headers: {
-                    'Content-Type': 'application/json',
-                    'authorization': `Bearer ${this.apikey}`
-                },
-                method: 'post',
-                url: `${this.agent.endpoint}/api/v1/agents/${this.agent.agentid}/completions`,
-                data: {
-                    question,
-                    session_id: callChatOption.session_id,
-                    stream: true,
-                    optional: callChatOption.optional,
-                },
-                responseType: 'stream',
-                ...axiosOption
-            }
-            const response = await axios(opts);
-            const readableStream = Readable.from(response.data);
-            let index = 0, session_id,fullanswer='',errorKeeped=[],chunks:any=[];
-            for await (const chunk of readableStream) {
-                ///可能接收到的数据不完整，导致JSON.parse失败
-                let answerData = null, jsonStr = '';
-                try{
-                    jsonStr = chunk.toString().split('data:')
-                    if (jsonStr.length) jsonStr = jsonStr[jsonStr.length-1]+''
-                    answerData = JSON.parse(errorKeeped.join('') + jsonStr);
-                }catch(e){
-                    ////如果发生了JSON解析错误，则当前的数据不完整，留着拼凑下一回数据
-                    // console.log('json parse error===>', errorKeeped.join('') + jsonStr)
-                    errorKeeped.push(jsonStr)
-                    // console.log('After Push===>', errorKeeped.join('') )
-                    continue;
-                }
-                errorKeeped = [];
-                const { answer, running_status, reference } = answerData.data;
-                if (running_status === true) continue;
-                const segment = answer ? answer.replace(fullanswer,''):''
-                fullanswer = answer ?? fullanswer;
-                if (!session_id) session_id = answerData.data.session_id;
-                if (reference && reference.chunks && reference.chunks.length) chunks = chunks.concat(reference.chunks)
-                const finished = answerData.data === true;
-                let output = { successed: true, requestid, segment: segment, chunks, text: fullanswer, finish_reason: finished ? 'stop' : null, index: index++, session_id };
-                if (attach) output = Object.assign({}, output, attach);
-                this.emit(finished ? 'chatdone' : 'chattext', output)
-            }
-            return { successed: true, requestid }
-        } catch (error) {
-            
-            // this.emit('requesterror', { successed: false, requestid, error: 'call axios faied ' + error });
-            // return { successed: false, requestid }
-        }
-    }
-}

package/src/azureai.ts

@@ -1,180 +0,0 @@
-/**
- * 微软AZure OpenAI
- */
-import OpenAIBase from "./openaibase"
-import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters} from "./declare";
-import { OpenAIClient, AzureKeyCredential } from "@azure/openai";
-export default class AzureAI extends OpenAIBase<OpenAIClient> {
-
-    protected readonly azureSetting: AzureOpenAIPatameters;
-    constructor(apiKey: string, azureOption: AzureOpenAIPatameters, apiOption: OpenAIApiParameters = {}) {
-        super(apiKey, apiOption);
-        this.azureSetting = azureOption;
-        if (!this.azureSetting.endpoint.toLowerCase().startsWith('https://')) {
-            this.azureSetting.endpoint = 'https://' + this.azureSetting.endpoint;
-        }
-    }
-    /**
-     * 初始化OpenAI 的聊天对象Api
-     */
-    createOpenAI(apiKey: string): OpenAIClient {
-        return new OpenAIClient(this.azureSetting.endpoint, new AzureKeyCredential(apiKey));
-    }
-
-    get EmbeddingUrl(): string {
-        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|string[], callOption: any = {}): Promise<EmbeddingResult> {
-        if (!text) return { successed: false, error: { errcode: 2, errmsg: 'content required' } };
-        if (!this.aiApi) this.aiApi = this.createOpenAI(this.apiKey);
-        try{
-            const result = await this.aiApi.getEmbeddings(this.embeddingmodel || 'openai-embedding-ada-002', typeof text === 'string' ? [text] : text, callOption)
-            return { successed: true, embedding:result.data };
-        }
-        // 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';
-        // }
-
-        // try {
-        //     let param = {
-        //         ...axiosOption,
-        //         method: "post",
-        //         data: {
-        //             input: text
-        //         },
-        //         url: this.EmbeddingUrl
-        //     };
-        //     const response = await request(param)
-        //     if (response.successed && response.data) {
-        //         return { successed: true, embedding: response.data.data[0].embedding };
-        //     }
-        //     return { successed: false, ...response.data };
-        catch (error) {
-            return { successed: false, error };
-        }
-    }
-
-    /**
-     * 非流式聊天请求
-     * @param _chatText 
-     * @param _paramOption 
-     * @param _axiosOption 
-     */
-    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);
-
-        let message: Array<any> = typeof (chatText) == 'string' ?
-            [{ role: 'user', content: chatText }] : chatText;
-        try {
-            const response: any = await this.aiApi.getChatCompletions(
-                callChatOption?.model || this.chatModel,
-                message,
-                {
-                    temperature: Number(callChatOption?.temperature || this.temperature),
-                    maxTokens: Number(callChatOption?.maxtoken || this.maxtoken),
-                    topP: Number(callChatOption?.top_p || this.top_p),
-                    presencePenalty: Number(callChatOption?.presence_penalty || this.presence_penalty),
-                    frequencyPenalty: Number(callChatOption?.frequency_penalty || this.frequency_penalty),
-                    n: Number(callChatOption?.replyCounts || 1) || 1,
-                    tools: (callChatOption?.enableToolCall === 1 && callChatOption?.tools) ? callChatOption.tools : undefined,
-                    toolChoice: callChatOption?.enableToolCall === 1 ? 'auto' : undefined
-                });
-            const { promptTokens: prompt_tokens, completionTokens: completion_tokens, totalTokens: total_tokens } = response.usage
-            let rebuildChoice = [];
-            for (const msg of response.choices) {
-                const { index, finishReason: finish_reason, message } = msg
-                rebuildChoice.push({ index, finish_reason, message })
-            }
-            // if (response.data.choices[0].finish_reason === 'content_filter') {
-            //     console.log('content_filter');
-            //     return { successed: false, error: 'content_filter' };
-            // }
-            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 
-     */
-    override 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);
-        }
-        let message: Array<any> = 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);
-        let has_tool_calls=0,currentIndex, previous_index=-1, tool_calls:any[] = [];// 使用数组来存储工具调用
-        try {
-            const response: any = await this.aiApi.streamChatCompletions(
-                callChatOption?.model || this.chatModel,
-                message,
-                {
-                    temperature: Number(callChatOption?.temperature || this.temperature),
-                    maxTokens: Number(callChatOption?.maxtoken || this.maxtoken),
-                    topP: Number(callChatOption?.top_p || this.top_p),
-                    presencePenalty: Number(callChatOption?.presence_penalty || this.presence_penalty),
-                    frequencyPenalty: Number(callChatOption?.frequency_penalty || this.frequency_penalty),
-                    n: Number(callChatOption?.replyCounts || 1) || 1,
-                    tools: (callChatOption?.enableToolCall===1 && callChatOption?.tools) ? callChatOption.tools : undefined,
-                    toolChoice: callChatOption?.enableToolCall === 1 ?'auto':undefined
-                });
-            //console.log('tools', callChatOption.enableToolCall, callChatOption.tools)
-            let replytext: string[] = [];
-            for await (const event of response) {
-                for (const choice of event.choices) {
-                    const { finishReason: finishreason, index } = choice;
-                    const toolCalls = choice.delta?.toolCalls;
-                    ///存在了toolCalls
-                    if (toolCalls && toolCalls.length){
-                        currentIndex = toolCalls[0].index;
-                        has_tool_calls = 1;
-                        // 检查index是否发生变化
-                        //console.log('currentIndex,previous_index', currentIndex, previous_index)
-                        if (currentIndex !== previous_index) {
-                            tool_calls.push({
-                                id: toolCalls[0].id,
-                                type: 'function',
-                                function: {
-                                    name: toolCalls[0].function.name,
-                                    arguments: toolCalls[0].function.arguments
-                                }
-                            });
-                            // 更新previousIndex以供下次比较
-                            previous_index = currentIndex;
-                        } else {
-                            tool_calls[previous_index].function.arguments += toolCalls[0].function.arguments
-                        }
-                    }else{
-                        const content = choice.delta?.content;
-                        replytext.push(content);
-                    }
-                    let output = { successed: true, requestid, segment: choice.delta?.content, text: replytext.join(''), finish_reason: finishreason, index, has_tool_calls: has_tool_calls, tool_calls: tool_calls };
-                    if (attach) output = Object.assign({}, output, attach);
-                    this.emit(finishreason ? 'chatdone' : 'chattext', output)
-                }
-            }
-            return { successed: true, requestid }
-        } catch (error) {
-            this.emit('requesterror', { successed: false, requestid, error: 'call axios faied ' +error });
-            return { successed: false, requestid }
-        }
-    }
-}

package/src/baiduai.ts

@@ -1,86 +0,0 @@
-import { 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 };
-        }
-
-    }
-}
-export interface AccessTokenResult extends ApiResult {
-    'access_token'?: string
-}
-export interface ApiCredential{
-    'apikey':string,
-    'securitykey': string
-}

package/src/corzauthorization.ts

@@ -1,59 +0,0 @@
-import fs  from 'fs';
-import path from 'path';
-import { getJWTToken, COZE_CN_BASE_URL } from '@coze/api';
-export class CorzAuthorization {
-    private accessToken: string | null |undefined;
-    private expiresAt: number = 0;
-    private pemfile: string;
-    private secret: string;
-    private sessionName: string;
-    constructor(public appid: string,setting:Record<string,any>) {
-        this.secret = setting["keyid"];
-        this.pemfile = setting["pemfile"] ||  "private.pem"
-        this.sessionName = setting["sessionName"] || "default";
-    }
-    /**
-     * 获取授权令牌
-     * @returns 
-     */
-    async getAccessToken():Promise<string|null> {
-        // 检查令牌是否存在且未过期,如果有效直接放回
-        if (this.accessToken && Date.now() < this.expiresAt) return this.accessToken;
-        // 开始新的授权
-        const result = await this.doAuthorize();
-        if (!result.successed) return null;
-        // 缓存授权令牌和过期时间
-        this.accessToken = result.accessToken!;
-        // 将 expires_in 转换为绝对时间戳
-        this.expiresAt = result.expires_in! * 1000; // 将秒转换为毫秒
-        return this.accessToken;
-    }
-    /**
-     * 进行授权
-     * @returns 
-     */
-    private async doAuthorize(): Promise<{ successed: boolean, accessToken?: string, expires_in?: number,error?:any }> {
-        try {
-            // 提取您的 COZE API 授权参数
-            //const keyid = "H7rAk-5s0TPOs9-rXnCr7pvkPhpJZGArT__UuMyhbkg";
-            const aud = "api.coze.cn";
-            // 读取私钥
-            const fileFullPath =path.join(process.cwd(), this.pemfile);
-            if (!fs.existsSync(fileFullPath)) return { successed: false, error: `${fileFullPath} not existed`}
-            const privateKey = fs.readFileSync(fileFullPath).toString();
-
-            // 获取JWT令牌
-            const result = await getJWTToken({
-                baseURL: COZE_CN_BASE_URL,
-                appId:this.appid,
-                aud,
-                keyid:this.secret,
-                privateKey,
-                sessionName:this.sessionName,
-            });
-            return {successed: true, accessToken: result.access_token, expires_in: result.expires_in}
-        } catch (error) {
-            return { successed: true, error }
-        } 
-    }
-}