doomiaichat 4.4.0 → 4.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/openai.js +10 -6
  2. package/dist/stabilityai.d.ts +3 -0
  3. package/dist/stabilityplusai.js +5 -4
  4. package/package.json +1 -1
  5. package/src/openai.ts +7 -7
  6. package/src/stabilityai.ts +4 -1
  7. package/src/stabilityplusai.ts +5 -4
package/dist/openai.js CHANGED
@@ -359,13 +359,10 @@ class OpenAIGpt extends gptbase_1.default {
359
359
  * @returns
360
360
  */
361
361
  pickUpFaqContent(messages) {
362
+ var _a, _b;
363
+ if (!((_b = (_a = messages[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
364
+ return [];
362
365
  let answerString = messages[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
363
- // const firstsybmol = answerString.indexOf("["); ////必须过滤出来数组
364
- // const lastsybmol = answerString.lastIndexOf("]");
365
- // console.log('answerString', answerString)
366
- // if (firstsybmol < 0 || lastsybmol < 0 || lastsybmol <= firstsybmol) return [];
367
- // answerString = answerString.substr(firstsybmol, lastsybmol - firstsybmol + 1);
368
- // console.log('answerString', answerString)
369
366
  let jsonObj = this.fixedJsonString(answerString);
370
367
  if (!jsonObj.length)
371
368
  return [];
@@ -433,6 +430,7 @@ class OpenAIGpt extends gptbase_1.default {
433
430
  /**
434
431
  * 每种类型的题目进行遍历
435
432
  */
433
+ console.log('arrContent.length', arrContent.length);
436
434
  noMoreQuestionRetrive = true;
437
435
  for (const key of QUESTION_TYPE) {
438
436
  ///还需要抓取题目
@@ -440,7 +438,9 @@ class OpenAIGpt extends gptbase_1.default {
440
438
  noMoreQuestionRetrive = false;
441
439
  let itemCount = Math.min(remainCount[key], Math.ceil(subarray.length * sectionCount[key]));
442
440
  subarray.unshift({ role: 'system', content: QUESTION_TEXT_MAPPING[key].replace('@ITEMCOUNT@', itemCount) });
441
+ console.log('subarray', subarray);
443
442
  let result = yield this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
443
+ console.log('subarray returned', result.successed);
444
444
  if (result.successed && result.message) {
445
445
  //console.log('paper result', key, result.message.length)
446
446
  let pickedQuestions = this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
@@ -459,6 +459,7 @@ class OpenAIGpt extends gptbase_1.default {
459
459
  ////删除已经处理的文本
460
460
  arrContent.splice(0, MESSAGE_LENGTH);
461
461
  }
462
+ console.log('parseover');
462
463
  ///发出信号，解析完毕
463
464
  this.emit('parseover', { type: 'question', items: paperReturned });
464
465
  return { successed: true, score: totalscore, paper: paperReturned };
@@ -470,6 +471,9 @@ class OpenAIGpt extends gptbase_1.default {
470
471
  *
471
472
  */
472
473
  pickUpQuestions(result, count, questiontype, score = 1) {
474
+ var _a, _b;
475
+ if (!((_b = (_a = result[0]) === null || _a === void 0 ? void 0 : _a.message) === null || _b === void 0 ? void 0 : _b.content))
476
+ return [];
473
477
  let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
474
478
  let jsonObj = this.fixedJsonString(answerString);
475
479
  if (!jsonObj.length)
package/dist/stabilityai.d.ts CHANGED
@@ -27,6 +27,9 @@ export interface StabilityOption {
27
27
  'sampler'?: string;
28
28
  'negative'?: string;
29
29
  'engine'?: string;
30
+ 'endpoint'?: string;
31
+ 'denoising_strength'?: number;
32
+ 'hr_scale'?: number;
30
33
  }
31
34
  export interface StabilityResult extends ApiResult {
32
35
  'data'?: any;
package/dist/stabilityplusai.js CHANGED
@@ -29,18 +29,18 @@ class StabilityPlusAI extends stabilityai_1.default {
29
29
  }
30
30
  });
31
31
  try {
32
- let param = Object.assign(Object.assign({}, axiosOption), { method: "post", url: `${this.apiSetting.endpoint}/sdapi/v1/txt2img`, data: {
32
+ let param = Object.assign(Object.assign({}, axiosOption), { method: "post", url: `${paramOption.endpoint || this.apiSetting.endpoint}/sdapi/v1/txt2img`, data: {
33
33
  "enable_hr": false,
34
- "denoising_strength": 0,
34
+ "denoising_strength": paramOption.denoising_strength || this.apiOption.denoising_strength || 0,
35
35
  "firstphase_width": 0,
36
36
  "firstphase_height": 0,
37
- "hr_scale": 2,
37
+ "hr_scale": paramOption.hr_scale || this.apiOption.hr_scale || 2,
38
38
  "hr_upscaler": "string",
39
39
  "hr_second_pass_steps": 0,
40
40
  "hr_resize_x": 0,
41
41
  "hr_resize_y": 0,
42
42
  "prompt": chatText,
43
- "styles": [paramOption.engine || this.apiSetting.engine || "bra_v5"],
43
+ "styles": ["string"],
44
44
  "seed": paramOption.seed || this.apiOption.seed || -1,
45
45
  "subseed": -1,
46
46
  "subseed_strength": 0,
@@ -69,6 +69,7 @@ class StabilityPlusAI extends stabilityai_1.default {
69
69
  // "save_images": false,
70
70
  // "alwayson_scripts": {}
71
71
  } });
72
+ console.log('param', param);
72
73
  const response = yield (0, declare_1.request)(param);
73
74
  if (response.successed) {
74
75
  return { successed: true, type: 'image', data: response.data.images, };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "doomiaichat",
3
- "version": "4.4.0",
3
+ "version": "4.6.0",
4
4
  "description": "Doomisoft OpenAI",
5
5
  "main": "dist/index.js",
6
6
  "scripts": {
package/src/openai.ts CHANGED
@@ -330,14 +330,8 @@ export default class OpenAIGpt extends GptBase {
330
330
  * @returns
331
331
  */
332
332
  protected pickUpFaqContent(messages: Array<any>): Array<FaqItem> {
333
+ if (!messages[0]?.message?.content) return [];
333
334
  let answerString = messages[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
334
- // const firstsybmol = answerString.indexOf("["); ////必须过滤出来数组
335
- // const lastsybmol = answerString.lastIndexOf("]");
336
-
337
- // console.log('answerString', answerString)
338
- // if (firstsybmol < 0 || lastsybmol < 0 || lastsybmol <= firstsybmol) return [];
339
- // answerString = answerString.substr(firstsybmol, lastsybmol - firstsybmol + 1);
340
- // console.log('answerString', answerString)
341
335
  let jsonObj = this.fixedJsonString(answerString);
342
336
  if (!jsonObj.length) return []
343
337
  try {
@@ -403,6 +397,7 @@ export default class OpenAIGpt extends GptBase {
403
397
  /**
404
398
  * 每种类型的题目进行遍历
405
399
  */
400
+ console.log('arrContent.length', arrContent.length)
406
401
  noMoreQuestionRetrive = true;
407
402
  for (const key of QUESTION_TYPE) {
408
403
  ///还需要抓取题目
@@ -411,7 +406,9 @@ export default class OpenAIGpt extends GptBase {
411
406
 
412
407
  let itemCount = Math.min(remainCount[key], Math.ceil(subarray.length * sectionCount[key]));
413
408
  subarray.unshift({ role: 'system', content: QUESTION_TEXT_MAPPING[key].replace('@ITEMCOUNT@', itemCount) })
409
+ console.log('subarray', subarray)
414
410
  let result = await this.chatRequest(subarray, { replyCounts: 1 }, axiosOption);
411
+ console.log('subarray returned', result.successed)
415
412
  if (result.successed && result.message) {
416
413
  //console.log('paper result', key, result.message.length)
417
414
  let pickedQuestions = this.pickUpQuestions(result.message, itemCount, key, ITEM_SCORE[key]);
@@ -427,9 +424,11 @@ export default class OpenAIGpt extends GptBase {
427
424
  // subarray.splice(subarray.length - 1, 1); ///把第一个角色定位的问法删除
428
425
  }
429
426
  }
427
+
430
428
  ////删除已经处理的文本
431
429
  arrContent.splice(0, MESSAGE_LENGTH);
432
430
  }
431
+ console.log('parseover')
433
432
  ///发出信号，解析完毕
434
433
  this.emit('parseover', { type: 'question', items: paperReturned })
435
434
  return { successed: true, score: totalscore, paper: paperReturned }
@@ -440,6 +439,7 @@ export default class OpenAIGpt extends GptBase {
440
439
  *
441
440
  */
442
441
  protected pickUpQuestions(result: Array<any>, count: number, questiontype: string, score: number = 1): Array<QuestionItem> {
442
+ if (!result[0]?.message?.content) return [];
443
443
  let answerString = result[0].message.content.trim().replace(/\t|\n|\v|\r|\f/g, '');
444
444
  let jsonObj = this.fixedJsonString(answerString);
445
445
  if (!jsonObj.length) return []
package/src/stabilityai.ts CHANGED
@@ -76,7 +76,10 @@ export interface StabilityOption {
76
76
  'steps'?: number,
77
77
  'sampler'?:string,
78
78
  'negative'?:string,
79
- 'engine'?:string
79
+ 'engine'?:string,
80
+ 'endpoint'?:string
81
+ 'denoising_strength'?:number,
82
+ 'hr_scale'?:number
80
83
  }
81
84
 
82
85
  export interface StabilityResult extends ApiResult {
package/src/stabilityplusai.ts CHANGED
@@ -17,19 +17,19 @@ export default class StabilityPlusAI extends StabilityAI {
17
17
  let param = {
18
18
  ...axiosOption,
19
19
  method: "post",
20
- url: `${this.apiSetting.endpoint}/sdapi/v1/txt2img`,
20
+ url: `${paramOption.endpoint || this.apiSetting.endpoint}/sdapi/v1/txt2img`,
21
21
  data: {
22
22
  "enable_hr": false,
23
- "denoising_strength": 0,
23
+ "denoising_strength": paramOption.denoising_strength || this.apiOption.denoising_strength || 0,
24
24
  "firstphase_width": 0,
25
25
  "firstphase_height": 0,
26
- "hr_scale": 2,
26
+ "hr_scale": paramOption.hr_scale || this.apiOption.hr_scale || 2,
27
27
  "hr_upscaler": "string",
28
28
  "hr_second_pass_steps": 0,
29
29
  "hr_resize_x": 0,
30
30
  "hr_resize_y": 0,
31
31
  "prompt": chatText,
32
- "styles": [paramOption.engine || this.apiSetting.engine || "bra_v5"], //["bra_v5"], //模型
32
+ "styles":["string"], //[paramOption.engine || this.apiSetting.engine || "bra_v5"], //["bra_v5"], //模型
33
33
  "seed": paramOption.seed || this.apiOption.seed || -1,
34
34
  "subseed": -1,
35
35
  "subseed_strength": 0,
@@ -60,6 +60,7 @@ export default class StabilityPlusAI extends StabilityAI {
60
60
  },
61
61
 
62
62
  };
63
+ console.log('param', param)
63
64
  const response: any = await request(param)
64
65
  if (response.successed) {
65
66
  return { successed: true, type: 'image', data: response.data.images, };