@3-/aiapi 0.1.47 → 0.1.49

package/fmtJson.js

@@ -3,15 +3,13 @@ import fmtSeg from './fmtSeg.js';
 
 import partition from './partition.js';
 
-import seg from './seg.js';
-
 export default async(chat, txt) => {
   var gen, i, pli, result, sum, tmp, txt_li;
   if (!txt) {
     return [];
   }
-  txt_li = txt.split('\n');
-  pli = (await partition(chat, txt_li, (await seg(chat, txt_li))));
+  txt_li = txt.replaceAll('\r\n', '\n').replaceAll('\r', '\n').split('\n');
+  pli = (await partition(chat, txt_li));
   result = [];
   sum = 0;
   tmp = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@3-/aiapi",
-  "version": "0.1.47",
+  "version": "0.1.49",
   "repository": {
     "type": "git",
     "url": "git+https://atomgit.com/i18n/lib.git"

package/partition.js

@@ -1,6 +1,6 @@
 import seg from "./seg.js"
 
-const partition = async (lines, title_number, remain_seg) => {
+const partition = async (li, title_number, remain_seg) => {
 	let title = ""
 	const order = title_number.sort((a, b) => a[1] - b[1])
 	const result = []
@@ -9,16 +9,16 @@ const partition = async (lines, title_number, remain_seg) => {
 	for (const [t, row] of order) {
 		console.log(t)
 		const index = row - 1
-		result.push(title + lines.slice(start, index).join("\n"))
+		result.push(title + li.slice(start, index).join("\n"))
 		title = "# " + t + "\n"
 		start = index
 	}
 
-	if (start < lines.length) {
-		lines = lines.slice(start)
-		const remain = lines.join("\n")
+	if (start < li.length) {
+		li = li.slice(start)
+		const remain = li.join("\n")
 		if (remain.length > 6000) {
-			return result.concat(await remain_seg(lines))
+			return result.concat(await remain_seg(li))
 		} else {
 			result.push(title + remain)
 		}
@@ -27,7 +27,17 @@ const partition = async (lines, title_number, remain_seg) => {
 	return result
 }
 
-export default (chat, lines, title_number) =>
-	partition(lines, title_number, async (li) =>
-		partition(li, await seg(chat, li), (i) => i),
+const repartition = (chat, len) => async (li) => {
+	if (li.length == len) {
+		return li
+	}
+	if (li.length == 1) {
+		li = li[0].split("。")
+	}
+	return partition(li, await seg(chat, li), (i) =>
+		repartition(chat, li.length)(i),
 	)
+}
+
+export default async (chat, li) =>
+	partition(li, await seg(chat, li), repartition(chat, li.length))