doomiaichat 2.4.0 → 2.6.0

package/dist/azureai.d.ts

@@ -1,4 +1,4 @@
-import { AzureOpenAIPatameters, ChatReponse, OpenAIApiParameters } from "./declare";
+import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters } from "./declare";
 import OpenAIGpt from "./openai";
 export default class AzureAI extends OpenAIGpt {
     protected readonly azureSetting: AzureOpenAIPatameters;
@@ -7,6 +7,12 @@ export default class AzureAI extends OpenAIGpt {
      * ZAure OpenAI 最新的URL地址
      */
     get BaseUrl(): string;
+    get EmbeddingUrl(): string;
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(text: string, axiosOption?: any): Promise<EmbeddingResult>;
     /**
      * 请求GPT接口
      */

package/dist/azureai.js

@@ -29,6 +29,39 @@ class AzureAI extends openai_1.default {
     get BaseUrl() {
         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`;
+    }
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(text, axiosOption = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!text)
+                return { successed: false, error: { errcode: 2, errmsg: 'content required' } };
+            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 = Object.assign(Object.assign({}, axiosOption), { method: "post", data: {
+                        input: text
+                    }, url: this.EmbeddingUrl });
+                console.log('param', param);
+                const response = yield (0, declare_1.request)(param);
+                if (response.data) {
+                    return { successed: true, embedding: response.data.data[0].embedding };
+                }
+                return Object.assign({ successed: false }, response.data);
+            }
+            catch (error) {
+                return { successed: false, error };
+            }
+        });
+    }
     /**
      * 请求GPT接口
      */
@@ -96,6 +129,9 @@ class AzureAI extends openai_1.default {
             ///回答的内容非JSON格式，自己来提取算了
             console.log('自己组装', value);
             let sentences = value.split(/",|\n/g); ///用换行或",来割分文本内容
+            sentences = sentences.map((str) => {
+                return str.replace(/(\[|"|\]|\{|\})/g, '');
+            });
             // let matched = value.match(/\d+分/g), score = 0;
             // if (matched && matched.length) {
             //     score = Number(matched[0].replace('分', ''));

package/dist/baiduai.d.ts

@@ -14,6 +14,11 @@ export default class BaiduWenXinAI extends GptBase {
      * 获取调用Api的Token
      */
     getAccessToken(): Promise<AccessTokenResult>;
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(_text: string, _axiosOption: any): Promise<any>;
     /**
      * 请求GPT接口
      */

package/dist/baiduai.js

@@ -53,6 +53,15 @@ class BaiduWenXinAI extends gptbase_1.default {
             return { successed: false, error: tokenData.data.msg };
         });
     }
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(_text, _axiosOption) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return null;
+        });
+    }
     /**
      * 请求GPT接口
      */

package/dist/declare.d.ts

@@ -57,6 +57,7 @@ export interface OpenAIApiParameters {
 export interface AzureOpenAIPatameters {
     'endpoint': string;
     'engine': string;
+    'embedding'?: string;
     'version'?: string;
 }
 /**
@@ -97,6 +98,12 @@ export interface CommentResult extends ApiResult {
     'score'?: number;
     'comment'?: string;
 }
+/**
+ * 调用OpenAI Api的向量约定
+ */
+export interface EmbeddingResult extends ApiResult {
+    'embedding'?: number[];
+}
 /**
  * 调用OpenAI Api的参数约定
  */

package/dist/gptbase.d.ts

@@ -6,6 +6,11 @@ export default abstract class GptBase extends EventEmitter {
      * 构造函数
      */
     constructor();
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    abstract getTextEmbedding(text: string, axiosOption: any): Promise<any>;
     /**
      * 自由聊天模式
      * @param chatText

package/dist/openai.d.ts

@@ -17,6 +17,11 @@ export default class OpenAIGpt extends GptBase {
      * 初始化OpenAI 的聊天对象Api
      */
     createOpenAI(apiKey: string): OpenAIApi;
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(_text: string, _axiosOption: any): Promise<any>;
     /**
      * 向OpenAI发送一个聊天请求
      * @param {*} chatText

package/dist/openai.js

@@ -44,6 +44,15 @@ class OpenAIGpt extends gptbase_1.default {
     createOpenAI(apiKey) {
         return new openai_1.OpenAIApi(new openai_1.Configuration({ apiKey }));
     }
+    /**
+     * 获得文字的向量
+     * @param text
+     */
+    getTextEmbedding(_text, _axiosOption) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return null;
+        });
+    }
     /**
      * 向OpenAI发送一个聊天请求
      * @param {*} chatText
@@ -86,10 +95,11 @@ class OpenAIGpt extends gptbase_1.default {
             if (!question || !answer)
                 return { successed: false, error: { errcode: 2, errmsg: '缺失参数' } };
             let message = [
-                { role: 'system', content: '你是一名专业的培训师。' },
+                { role: 'system', content: '你是一名专业的知识点评师。' },
                 { role: 'user', content: `问题题干:“${question}”` },
                 { role: 'user', content: `回答内容:“${answer}”` },
-                { role: 'user', content: `请根据以上的回答内容进行点评，给出一段不超过200字的评语，以及0-100的得分。最终结果按照{"comment":"评语","score":80}的JSON结构输出` }
+                { role: 'user', content: `请根据以上的回答内容进行点评，给出一段不超过200字的评语，并给出0-100的评分。` },
+                { role: 'user', content: `结果完整按照{"comment":"点评内容","score":"评分"}的JSON结构输出` }
             ];
             const result = yield this.chatRequest(message, {}, axiosOption);
             if (result.successed && result.message) {
@@ -120,6 +130,7 @@ class OpenAIGpt extends gptbase_1.default {
                 return { successed: false, error: { errcode: 2, errmsg: '缺失参数' } };
             const emotion = ['愤怒', '威胁', '讽刺', '愧疚', '兴奋', '友好', '消极', '生气', '正常'];
             const messages = [
+                { role: 'system', content: `你是一名专业的语言大师` },
                 { role: 'user', content: s1 },
                 { role: 'user', content: `请分析上述内容的语言情绪,请从"${emotion.join(',')}"这些情绪中对应一个输出` },
             ];

package/package.json

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

package/src/azureai.ts

@@ -1,4 +1,4 @@
-import { AzureOpenAIPatameters, ChatReponse, OpenAIApiParameters, request } from "./declare";
+import { AzureOpenAIPatameters, ChatReponse, EmbeddingResult, OpenAIApiParameters, request } from "./declare";
 import OpenAIGpt from "./openai" 
 import { ChatCompletionRequestMessage } from "openai";
 export default class AzureAI extends OpenAIGpt {
@@ -17,6 +17,43 @@ export default class AzureAI extends OpenAIGpt {
     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`
+    }
+
+    /**
+     * 获得文字的向量
+     * @param text 
+     */
+    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' };
+        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
+            };
+            console.log('param', param)
+            const response = await request(param)
+            if (response.data) {
+                return { successed: true, embedding: response.data.data[0].embedding };
+            }
+            return { successed: false, ...response.data };
+        } catch (error) {
+            return { successed: false, error };
+        }
+    }
     /**
      * 请求GPT接口
      */
@@ -85,6 +122,9 @@ export default class AzureAI extends OpenAIGpt {
         
         console.log('自己组装', value);
         let sentences = value.split(/",|\n/g)       ///用换行或",来割分文本内容
+        sentences = sentences.map((str: string)=>{
+            return str.replace(/(\[|"|\]|\{|\})/g, '')
+        })
         // let matched = value.match(/\d+分/g), score = 0;
         // if (matched && matched.length) {
         //     score = Number(matched[0].replace('分', ''));

package/src/baiduai.ts

@@ -38,6 +38,13 @@ export default class BaiduWenXinAI extends GptBase {
         }
         return { successed: false, error: tokenData.data.msg }
     }
+    /**
+     * 获得文字的向量
+     * @param text 
+     */
+    async getTextEmbedding(_text: string, _axiosOption: any): Promise<any> {
+        return null;
+    }
     /**
      * 请求GPT接口
      */

package/src/declare.ts

@@ -61,7 +61,8 @@ export interface OpenAIApiParameters {
  */
 export interface AzureOpenAIPatameters{
     'endpoint':string;  ///端点
-    'engine':string;    ///部署的项目名称
+    'engine':string;    ///GPT部署的项目名称
+    'embedding'?: string;  ///向量引擎项目名称
     'version'?:string;   ///Api 版本
 }
 
@@ -105,6 +106,13 @@ export interface CommentResult extends ApiResult {
     'score'?:number,
     'comment'?: string;    ///评价内容
 }
+
+/**
+ * 调用OpenAI Api的向量约定
+ */
+export interface EmbeddingResult extends ApiResult {
+    'embedding'?: number[],
+}
 /**
  * 调用OpenAI Api的参数约定
  */

package/src/gptbase.ts

@@ -8,6 +8,11 @@ export default abstract class GptBase extends EventEmitter {
     constructor() {
         super();
     }
+    /**
+     * 获得文字的向量
+     * @param text 
+     */
+    abstract getTextEmbedding(text: string, axiosOption: any):Promise<any>;
     /**
      * 自由聊天模式
      * @param chatText 

package/src/openai.ts

@@ -38,6 +38,14 @@ export default class OpenAIGpt extends GptBase {
     createOpenAI(apiKey: string): OpenAIApi {
         return new OpenAIApi(new Configuration({ apiKey }))
     }
+
+    /**
+     * 获得文字的向量
+     * @param text 
+     */
+    async getTextEmbedding(_text: string, _axiosOption: any): Promise<any>{
+        return null;
+    }
     /**
      * 向OpenAI发送一个聊天请求
      * @param {*} chatText 
@@ -77,17 +85,18 @@ export default class OpenAIGpt extends GptBase {
     async commentQuestionAnswer(question: string, answer: string, axiosOption: any = { timeout: 30000 }): Promise<CommentResult>{
         if (!question || !answer) return { successed: false, error: { errcode: 2, errmsg: '缺失参数' } }
         let message = [
-            {role:'system',content:'你是一名专业的培训师。'},
+            {role:'system',content:'你是一名专业的知识点评师。'},
             { role: 'user', content: `问题题干:“${question}”`},
             { role: 'user', content: `回答内容:“${answer}”` },
-            { role: 'user', content: `请根据以上的回答内容进行点评，给出一段不超过200字的评语，以及0-100的得分。最终结果按照{"comment":"评语","score":80}的JSON结构输出` }
+            { role: 'user', content: `请根据以上的回答内容进行点评，给出一段不超过200字的评语，并给出0-100的评分。`},
+            { role: 'user', content: `结果完整按照{"comment":"点评内容","score":"评分"}的JSON结构输出` }
         ]
         const result = await this.chatRequest(message, {}, axiosOption);
         if (result.successed && result.message) {
             let value = result.message[0].message.content.trim();
             let replyJson = this.fixedJsonString(value);
             ///能够提取到内容
-            if (replyJson.length)return { successed: true,...replyJson[0] }
+            if (replyJson.length) return { successed: true,...replyJson[0] }
             ///回答的内容非JSON格式，自己来提取算了
             console.log('自己组装')
             let matched = value.match(/\d+分/g),score=0;
@@ -107,6 +116,7 @@ export default class OpenAIGpt extends GptBase {
         if (!s1) return { successed: false, error: { errcode: 2, errmsg: '缺失参数' } }
         const emotion = ['愤怒', '威胁', '讽刺', '愧疚', '兴奋', '友好', '消极', '生气', '正常'];
         const messages = [
+            { role: 'system', content: `你是一名专业的语言大师` },
             { role: 'user', content: s1 },
             { role: 'user', content: `请分析上述内容的语言情绪,请从"${emotion.join(',')}"这些情绪中对应一个输出` },
         ]