@3-/aiapi 0.1.45 → 0.1.47

package/fmtJson.js

@@ -6,15 +6,12 @@ import partition from './partition.js';
 import seg from './seg.js';
 
 export default async(chat, txt) => {
-  var gen, i, pli, result, split_li, sum, tmp, txt_li;
+  var gen, i, pli, result, sum, tmp, txt_li;
   if (!txt) {
     return [];
   }
   txt_li = txt.split('\n');
-  split_li = (await seg(chat, txt_li));
-  pli = partition(txt_li, split_li.map((i) => {
-    return [i.题, i.行];
-  }));
+  pli = (await partition(chat, txt_li, (await seg(chat, txt_li))));
   result = [];
   sum = 0;
   tmp = [];

package/gemini.js

@@ -21,7 +21,7 @@ export default (token_li, model = 'gemini-2.5-pro') => {
     return _NEXT_TOKEN.next().value;
   };
   return async(text, schema, system, option) => {
-    var body, err, error, message, parts, r, retryed, status;
+    var body, err, error, json, message, parts, r, retryed, status;
     body = {
       contents: [
         {
@@ -52,6 +52,7 @@ export default (token_li, model = 'gemini-2.5-pro') => {
     retryed = token_li.length;
     while (true) {
       try {
+        // console.log 'https://generativelanguage.googleapis.com/v1beta/models/'+model+':generateContent'
         r = (await fetch('https://generativelanguage.googleapis.com/v1beta/models/' + model + ':generateContent', {
           headers: {
             'X-goog-api-key': nextToken(),
@@ -94,25 +95,26 @@ export default (token_li, model = 'gemini-2.5-pro') => {
         }
         throw new Error(text);
       }
-      r = ((await r.json())).candidates[0];
+      json = (await r.json());
+      ({parts} = json.candidates[0].content);
+      if (!parts) {
+        console.warn('miss parts', JSON.stringify(json, null, 2));
+        continue;
+      }
+      text = parts[0].text;
       if (schema) {
         try {
-          ({parts} = r.content);
-          if (!parts) {
-            console.warn('miss parts', r.content);
-            continue;
-          }
-          r = JSON.parse(parts[0].text);
+          return JSON.parse(text);
         } catch (error1) {
           err = error1;
-          console.error(body, r, err);
+          console.error(body, text, err);
           if (--retryed <= 0) {
             throw err;
           }
           continue;
         }
       }
-      return r;
+      return text;
     }
   };
 };

package/package.json

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

package/partition.js

@@ -1,27 +1,33 @@
-export default (lines, title_number) => {
-  let title = ''
-  // 对行号进行升序排序
-  const order = title_number.sort((a, b) => a[1] - b[1]);
+import seg from "./seg.js"
 
-  // 存储最终结果的数组
-  const result = [];
-  // 追踪上一个分割点的索引
-  let start = 0;
+const partition = async (lines, title_number, remain_seg) => {
+	let title = ""
+	const order = title_number.sort((a, b) => a[1] - b[1])
+	const result = []
+	let start = 0
 
-  // 遍历排序后的行号
-  for (const [t, row] of order) {
-    console.log(t)
-    // 将行号转换为从0开始的数组索引
-    const index = row - 1;
-    result.push(title + lines.slice(start, index).join('\n'));
-    title = '# ' + t + '\n'
-    start = index;
-  }
+	for (const [t, row] of order) {
+		console.log(t)
+		const index = row - 1
+		result.push(title + lines.slice(start, index).join("\n"))
+		title = "# " + t + "\n"
+		start = index
+	}
 
-  // 添加从最后一个分割点到末尾的剩余文本
-  if (start < lines.length) {
-    result.push(title + lines.slice(start).join('\n'));
-  }
+	if (start < lines.length) {
+		lines = lines.slice(start)
+		const remain = lines.join("\n")
+		if (remain.length > 6000) {
+			return result.concat(await remain_seg(lines))
+		} else {
+			result.push(title + remain)
+		}
+	}
 
-  return result;
-};
+	return result
+}
+
+export default (chat, lines, title_number) =>
+	partition(lines, title_number, async (li) =>
+		partition(li, await seg(chat, li), (i) => i),
+	)

package/seg.js

@@ -8,7 +8,7 @@ export default async(chat, txt_li) => {
 输出章节标题和每章首个问题的行号及原文,输出格式为JSON数组:\n` + txt_li.map((i, pos) => {
     return (pos + 1) + '\t' + i.trim();
   }).join('\n');
-  return split_li = (await chat(提示词, {
+  split_li = (await chat(提示词, {
     type: TYPE.ARRAY,
     description: '章节和行号的列表',
     minItems: 1,
@@ -31,4 +31,7 @@ export default async(chat, txt_li) => {
       required: ['题', '行', '文']
     }
   }, '你是专业资深的秘书'));
+  return split_li.map((i) => {
+    return [i.题, i.行];
+  });
 };