doomiaichat 4.0.0 → 4.2.0

package/dist/azureai.js

@@ -20,8 +20,7 @@ class AzureAI extends openai_1.default {
     constructor(apiKey, azureOption, apiOption = {}) {
         super(apiKey, apiOption);
         this.azureSetting = azureOption;
-        if (!this.azureSetting.endpoint.toLowerCase().startsWith('https://') &&
-            !this.azureSetting.endpoint.toLowerCase().startsWith('https://')) {
+        if (!this.azureSetting.endpoint.toLowerCase().startsWith('https://')) {
             this.azureSetting.endpoint = 'https://' + this.azureSetting.endpoint;
         }
     }

package/dist/gptprovider.d.ts

@@ -9,6 +9,7 @@ export declare const GptProviderEnum: {
     readonly BAIDU: "baidu";
     readonly GOOGLE: "google";
     readonly STABILITY: "stability";
+    readonly STABILITY2: "stability2";
 };
 export type GptProviderEnum = typeof GptProviderEnum[keyof typeof GptProviderEnum];
 /**

package/dist/gptprovider.js

@@ -11,6 +11,7 @@ exports.createGpt = exports.GptProviderEnum = void 0;
 const openai_1 = __importDefault(require("./openai"));
 const azureai_1 = __importDefault(require("./azureai"));
 const stabilityai_1 = __importDefault(require("./stabilityai"));
+const stabilityplusai_1 = __importDefault(require("./stabilityplusai"));
 const baiduai_1 = __importDefault(require("./baiduai"));
 /**
  * OpenAI/NLP 的服务提供商 OpenAI,微软，百度文心(待接入)，google(待接入)
@@ -20,7 +21,8 @@ exports.GptProviderEnum = {
     MICROSOFT: 'microsoft',
     BAIDU: 'baidu',
     GOOGLE: 'google',
-    STABILITY: 'stability'
+    STABILITY: 'stability',
+    STABILITY2: 'stability2',
 };
 /**
  * 根据类型创建不同的TTS引擎对象
@@ -41,6 +43,8 @@ function createGpt(provider, apikey, setting) {
             return new baiduai_1.default(cred);
         case exports.GptProviderEnum.STABILITY:
             return new stabilityai_1.default(apikey + '', { endpoint, engine }, setting);
+        case exports.GptProviderEnum.STABILITY2:
+            return new stabilityplusai_1.default(apikey + '', { endpoint, engine }, setting);
         default: return null;
     }
 }

package/dist/openai.js

@@ -471,12 +471,6 @@ class OpenAIGpt extends gptbase_1.default {
      */
     pickUpQuestions(result, count, questiontype, score = 1) {
         let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
-        // const firstsybmol = answerString.indexOf("[");   ////必须过滤出来数组
-        // const lastsybmol = answerString.lastIndexOf("]");
-        // console.log('answerString', answerString)
-        // if (firstsybmol < 0 || lastsybmol < 0 || lastsybmol <= firstsybmol) return [];
-        // answerString = answerString.substr(firstsybmol, lastsybmol - firstsybmol + 1);
-        // console.log('answerString', answerString)
         let jsonObj = this.fixedJsonString(answerString);
         if (!jsonObj.length)
             return [];
@@ -516,7 +510,8 @@ class OpenAIGpt extends gptbase_1.default {
                         questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
                         break;
                     case 'trueorfalse':
-                        questionitem.answer = [(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B'];
+                        let rightItem = questionitem.choice.find((x) => { return x.iscorrect == 1; });
+                        questionitem.answer = [(rightItem === null || rightItem === void 0 ? void 0 : rightItem.id) || 'Z']; //[(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
                         break;
                 }
                 ///单选题验证

package/dist/stabilityai.d.ts

@@ -23,6 +23,8 @@ export interface StabilityOption {
     'width'?: number;
     'samples'?: number;
     'steps'?: number;
+    'sampler'?: string;
+    'negative'?: string;
 }
 export interface StabilityResult extends ApiResult {
     'data'?: any;

package/dist/stabilityai.js

@@ -26,8 +26,7 @@ class StabilityAI extends gptbase_1.default {
         this.apiKey = apiKey;
         this.apiSetting = urlOption;
         this.apiOption = apiOption;
-        if (!this.apiSetting.endpoint.toLowerCase().startsWith('https://') &&
-            !this.apiSetting.endpoint.toLowerCase().startsWith('https://')) {
+        if (!this.apiSetting.endpoint.toLowerCase().startsWith('http')) {
             this.apiSetting.endpoint = 'https://' + this.apiSetting.endpoint;
         }
     }

package/dist/stabilityplusai.d.ts

@@ -0,0 +1,7 @@
+import StabilityAI, { StabilityOption, StabilityResult } from "./stabilityai";
+export default class StabilityPlusAI extends StabilityAI {
+    /**
+     * 请求Stable作画的接口
+     */
+    chatRequest(chatText: string, paramOption: StabilityOption, axiosOption?: any): Promise<StabilityResult>;
+}

package/dist/stabilityplusai.js

@@ -0,0 +1,86 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const declare_1 = require("./declare");
+const stabilityai_1 = __importDefault(require("./stabilityai"));
+class StabilityPlusAI extends stabilityai_1.default {
+    /**
+     * 请求Stable作画的接口
+     */
+    chatRequest(chatText, paramOption, axiosOption = {}) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!chatText)
+                return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
+            axiosOption = Object.assign({}, axiosOption, {
+                headers: {
+                    "Content-Type": "application/json",
+                    "Accept": "application/json",
+                    // "Authorization": `Bearer ${this.apiKey}`
+                }
+            });
+            try {
+                let param = Object.assign(Object.assign({}, axiosOption), { method: "post", url: `${this.apiSetting.endpoint}/sdapi/v1/txt2img`, data: {
+                        "enable_hr": false,
+                        "denoising_strength": 0,
+                        "firstphase_width": 0,
+                        "firstphase_height": 0,
+                        "hr_scale": 2,
+                        "hr_upscaler": "string",
+                        "hr_second_pass_steps": 0,
+                        "hr_resize_x": 0,
+                        "hr_resize_y": 0,
+                        "prompt": chatText,
+                        "styles": [this.apiSetting.engine || "bra_v5"],
+                        "seed": -1,
+                        "subseed": -1,
+                        "subseed_strength": 0,
+                        "seed_resize_from_h": -1,
+                        "seed_resize_from_w": -1,
+                        "sampler_name": paramOption.sampler || this.apiOption.sampler || "Euler",
+                        "batch_size": 1,
+                        "n_iter": paramOption.samples || this.apiOption.samples || 1,
+                        "steps": 50,
+                        "cfg_scale": paramOption.cfg_scale || this.apiOption.cfg_scale || 7,
+                        "width": paramOption.width || this.apiOption.width || 512,
+                        "height": paramOption.height || this.apiOption.height || 512,
+                        "restore_faces": false,
+                        "tiling": false,
+                        "do_not_save_samples": false,
+                        "do_not_save_grid": false,
+                        "negative_prompt": paramOption.negative || '',
+                        // "eta": 0,
+                        // "s_churn": 0,
+                        // "s_tmax": 0,
+                        // "s_tmin": 0,
+                        // "s_noise": 1,
+                        // "script_args": [],
+                        // "sampler_index": paramOption.sampler || this.apiOption.sampler || "Euler", //"Euler",
+                        // "send_images": true,
+                        // "save_images": false,
+                        // "alwayson_scripts": {}
+                    } });
+                const response = yield (0, declare_1.request)(param);
+                if (response.successed) {
+                    return { successed: true, type: 'image', data: response.data.images, };
+                }
+                return Object.assign({ successed: false }, response.data);
+            }
+            catch (error) {
+                console.log('result is error ', error);
+                return { successed: false, error };
+            }
+        });
+    }
+}
+exports.default = StabilityPlusAI;

package/package.json

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

package/src/azureai.ts

@@ -7,8 +7,7 @@ export default class AzureAI extends OpenAIGpt {
     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://')) {
+        if (!this.azureSetting.endpoint.toLowerCase().startsWith('https://')) {
             this.azureSetting.endpoint = 'https://' + this.azureSetting.endpoint;
         }
     }

package/src/gptprovider.ts

@@ -5,6 +5,7 @@
 import OpenAIGpt from './openai';
 import AzureAI from './azureai'
 import StabilityAI from './stabilityai'
+import StabilityPlusAI from './stabilityplusai'
 import BaiduWenXinAI, { ApiCredential } from './baiduai'
 import GptBase from './gptbase';
 /**
@@ -15,7 +16,8 @@ export const GptProviderEnum = {
     MICROSOFT: 'microsoft',
     BAIDU: 'baidu',
     GOOGLE:'google',
-    STABILITY:'stability'
+    STABILITY:'stability',
+    STABILITY2: 'stability2',
 } as const;
 export type GptProviderEnum = typeof GptProviderEnum[keyof typeof GptProviderEnum];
 /**
@@ -37,6 +39,8 @@ export function createGpt(provider: GptProviderEnum, apikey: string|ApiCredentia
             return new BaiduWenXinAI(cred);
         case GptProviderEnum.STABILITY:
             return new StabilityAI(apikey + '', { endpoint, engine }, setting);
+        case GptProviderEnum.STABILITY2:
+            return new StabilityPlusAI(apikey + '', { endpoint, engine }, setting);
         default: return null;
     }
 };

package/src/openai.ts

@@ -441,13 +441,6 @@ export default class OpenAIGpt extends GptBase {
      */
     protected pickUpQuestions(result: Array<any>, count: number, questiontype: string, score: number = 1): Array<QuestionItem> {
         let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
-        // const firstsybmol = answerString.indexOf("[");   ////必须过滤出来数组
-        // const lastsybmol = answerString.lastIndexOf("]");
-
-        // console.log('answerString', answerString)
-        // if (firstsybmol < 0 || lastsybmol < 0 || lastsybmol <= firstsybmol) return [];
-        // answerString = answerString.substr(firstsybmol, lastsybmol - firstsybmol + 1);
-        // console.log('answerString', answerString)
         let jsonObj = this.fixedJsonString(answerString);
         if (!jsonObj.length) return []
         let returnItems: QuestionItem[] = [];
@@ -487,7 +480,8 @@ export default class OpenAIGpt extends GptBase {
                         questionitem.answer = (questionitem.answer + '').replace(/,|[^ABCDEFG]/g, '').split('');
                         break;
                     case 'trueorfalse':
-                        questionitem.answer = [(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
+                        let rightItem = questionitem.choice.find((x: any) => { return x.iscorrect == 1 });
+                        questionitem.answer = [rightItem?.id || 'Z'] ;   //[(questionitem.answer + '').indexOf('正确') >= 0 ? 'A' : 'B']
                         break;
                 }
                 ///单选题验证

package/src/stabilityai.ts

@@ -16,8 +16,7 @@ export default class StabilityAI extends GptBase {
         this.apiKey = apiKey;
         this.apiSetting = urlOption;
         this.apiOption = apiOption;
-        if (!this.apiSetting.endpoint.toLowerCase().startsWith('https://') &&
-            !this.apiSetting.endpoint.toLowerCase().startsWith('https://')) {
+        if (!this.apiSetting.endpoint.toLowerCase().startsWith('http')) {
             this.apiSetting.endpoint = 'https://' + this.apiSetting.endpoint;
         }
     }
@@ -74,6 +73,8 @@ export interface StabilityOption {
     'width'?: number,
     'samples'?: number,
     'steps'?: number,
+    'sampler'?:string,
+    'negative'?:string
 }
 
 export interface StabilityResult extends ApiResult {

package/src/stabilityplusai.ts

@@ -0,0 +1,75 @@
+
+import { request } from "./declare";
+import StabilityAI, { StabilityOption, StabilityResult } from "./stabilityai"
+export default class StabilityPlusAI extends StabilityAI {
+    /**
+     * 请求Stable作画的接口
+     */
+    public override async chatRequest(chatText: string, paramOption: StabilityOption, axiosOption: any = {}): Promise<StabilityResult> {
+        if (!chatText) return { successed: false, error: { errcode: 2, errmsg: '缺失聊天的内容' } };
+        axiosOption = Object.assign({}, axiosOption, {
+            headers: {
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                // "Authorization": `Bearer ${this.apiKey}`
+            }
+        })
+        try {
+            let param = {
+                ...axiosOption,
+                method: "post",
+                url: `${this.apiSetting.endpoint}/sdapi/v1/txt2img`,
+                data: {
+                    "enable_hr": false,
+                    "denoising_strength": 0,
+                    "firstphase_width": 0,
+                    "firstphase_height": 0,
+                    "hr_scale": 2,
+                    "hr_upscaler": "string",
+                    "hr_second_pass_steps": 0,
+                    "hr_resize_x": 0,
+                    "hr_resize_y": 0,
+                    "prompt": chatText,
+                    "styles": [this.apiSetting.engine || "bra_v5"], //["bra_v5"],   //模型
+                    "seed": -1,
+                    "subseed": -1,
+                    "subseed_strength": 0,
+                    "seed_resize_from_h": -1,
+                    "seed_resize_from_w": -1,
+                    "sampler_name": paramOption.sampler || this.apiOption.sampler || "Euler", //"Euler",
+                    "batch_size": 1,
+                    "n_iter": paramOption.samples || this.apiOption.samples || 1,        //生成的数量
+                    "steps": 50,
+                    "cfg_scale": paramOption.cfg_scale || this.apiOption.cfg_scale || 7,
+                    "width": paramOption.width || this.apiOption.width || 512, 
+                    "height": paramOption.height || this.apiOption.height || 512,
+                    "restore_faces": false,
+                    "tiling": false,
+                    "do_not_save_samples": false,
+                    "do_not_save_grid": false,
+                    "negative_prompt": paramOption.negative || '',
+                    // "eta": 0,
+                    // "s_churn": 0,
+                    // "s_tmax": 0,
+                    // "s_tmin": 0,
+                    // "s_noise": 1,
+                    // "script_args": [],
+                    // "sampler_index": paramOption.sampler || this.apiOption.sampler || "Euler", //"Euler",
+                    // "send_images": true,
+                    // "save_images": false,
+                    // "alwayson_scripts": {}
+                },
+
+            };
+            const response: any = await request(param)
+            if (response.successed) {
+                return { successed: true, type: 'image', data: response.data.images, };
+            }
+            return { successed: false, ...response.data };
+        } catch (error) {
+            console.log('result is error ', error)
+            return { successed: false, error };
+        }
+
+    }
+}