@3-/aiapi 0.1.52 → 0.1.53

package/fmtJson.js

@@ -4,29 +4,12 @@ import fmtSeg from './fmtSeg.js';
 import partition from './partition.js';
 
 export default async(chat, txt) => {
-  var gen, i, pli, result, sum, tmp;
+  var pli;
   if (!txt) {
     return [];
   }
   pli = (await partition(chat, txt));
-  result = [];
-  sum = 0;
-  tmp = [];
-  gen = () => {
-    result.push(fmtSeg(chat, tmp.join('\n')));
-  };
-  for (i of pli) {
-    tmp.push(i);
-    sum += i.length;
-    if (sum > 3000) {
-      console.log(sum);
-      gen();
-      sum = 0;
-      tmp = [];
-    }
-  }
-  if (tmp.length) {
-    gen();
-  }
-  return Promise.all(result);
+  return Promise.all(pli.map(async([title, li]) => {
+    return [title, (await fmtSeg(chat, li.join('\n')))];
+  }));
 };

package/fmtJsonMd.js

@@ -7,15 +7,17 @@ txtFmt = (txt) => {
   return TxtLi(txt).join('\n\n');
 };
 
-export default (json_li) => {
-  var li, md_li, x, y, 答, 话题, 问, 问答, 题;
+export default (title_json_li) => {
+  var li, md_li, title, x, y, z, 答, 话题, 问, 问答, 题;
   md_li = [];
-  for (li of json_li) {
-    for (x of li) {
-      ({话题, 问答} = x);
+  for (x of title_json_li) {
+    [title, li] = x;
+    md_li.push('# ' + title);
+    for (y of li) {
+      ({话题, 问答} = y);
       md_li.push('## ' + 话题);
-      for (y of 问答) {
-        ({题, 问, 答} = y);
+      for (z of 问答) {
+        ({题, 问, 答} = z);
         md_li.push('### ' + 题 + '\n问: ' + txtFmt(问) + '\n答: ' + txtFmt(答));
       }
     }

package/gemini.js

@@ -3,7 +3,7 @@ import sleep from '@3-/sleep';
 
 import merge from 'lodash-es/merge.js';
 
-export default (token_li, model = 'gemini-2.5-pro') => {
+export default (token_li, model = 'gemini-3-pro-preview') => {
   var _NEXT_TOKEN, _nextToken, nextToken;
   token_li.sort(() => {
     return Math.random() - 0.5;
@@ -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, json, message, parts, r, retryed, status;
+    var body, err, error, json, message, parts, r, retryed, status, token, warn;
     body = {
       contents: [
         {
@@ -51,11 +51,15 @@ export default (token_li, model = 'gemini-2.5-pro') => {
     body = JSON.stringify(body);
     retryed = token_li.length;
     while (true) {
+      token = nextToken();
+      warn = (...args) => {
+        return console.log('\n→ ' + token + '\n', ...args, '\n');
+      };
       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(),
+            'X-goog-api-key': token,
             'Content-Type': 'application/json'
           },
           method: 'POST',
@@ -64,7 +68,7 @@ export default (token_li, model = 'gemini-2.5-pro') => {
         ({status} = r);
       } catch (error1) {
         err = error1;
-        console.error(err);
+        warn(err);
         await sleep(1000);
         continue;
       }
@@ -73,9 +77,9 @@ export default (token_li, model = 'gemini-2.5-pro') => {
         if (status === 429) {
           try {
             ({error} = JSON.parse(text));
-            console.warn(error.status, error.message);
+            warn(error.status, error.message);
           } catch (error1) {
-            console.warn(text);
+            warn(text);
           }
           continue;
         }
@@ -84,9 +88,9 @@ export default (token_li, model = 'gemini-2.5-pro') => {
             ({
               error: {message}
             } = JSON.parse(text));
-            console.warn(status, message);
+            warn(status, message);
           } catch (error1) {
-            console.warn(text);
+            warn(text);
           }
           if (status !== 500) {
             await sleep(1000);
@@ -98,7 +102,7 @@ export default (token_li, model = 'gemini-2.5-pro') => {
       json = (await r.json());
       ({parts} = json.candidates[0].content);
       if (!parts) {
-        console.warn('miss parts', JSON.stringify(json, null, 2));
+        warn('miss parts', JSON.stringify(json, null, 2));
         continue;
       }
       text = parts[0].text;
@@ -107,7 +111,7 @@ export default (token_li, model = 'gemini-2.5-pro') => {
           return JSON.parse(text);
         } catch (error1) {
           err = error1;
-          console.error(body, text, err);
+          warn(body, text, err);
           if (--retryed <= 0) {
             throw err;
           }

package/package.json

@@ -1,30 +1 @@
-{
-  "name": "@3-/aiapi",
-  "version": "0.1.52",
-  "repository": {
-    "type": "git",
-    "url": "git+https://atomgit.com/i18n/lib.git"
-  },
-  "homepage": "https://atomgit.com/i18n/lib/tree/dev/aiapi",
-  "author": "i18n.site@gmail.com",
-  "license": "MulanPSL-2.0",
-  "exports": {
-    ".": "./lib.js",
-    "./*": "./*"
-  },
-  "files": [
-    "./*"
-  ],
-  "devDependencies": {
-    "@3-/read": "^0.1.4"
-  },
-  "type": "module",
-  "dependencies": {
-    "@3-/retry": "^0.0.2",
-    "@3-/sleep": "^0.0.4",
-    "@3-/txt_li": "^0.1.5",
-    "@3-/utf8": "^0.0.4",
-    "lodash-es": "^4.17.21"
-  },
-  "scripts": {}
-}
+{"name":"@3-/aiapi","version":"0.1.53","repository":{"type":"git","url":"git+https://atomgit.com/i18n/lib.git"},"homepage":"https://atomgit.com/i18n/lib/tree/dev/aiapi","author":"i18n.site@gmail.com","license":"MulanPSL-2.0","exports":{".":"./lib.js","./*":"./*"},"files":["./*"],"devDependencies":{"@3-/read":"^0.1.4"},"scripts":{},"type":"module","dependencies":{"@3-/retry":"^0.0.2","@3-/sleep":"^0.0.4","@3-/txt_li":"^0.1.5","@3-/utf8":"^0.0.4","lodash-es":"^4.17.21"}}

package/partition.js

@@ -1,46 +1,46 @@
-import seg from "./seg.js"
-import txtLi from "@3-/txt_li"
+import seg from "./seg.js";
+import txtLi from "@3-/txt_li";
 
 const partition = async (li, title_number, remain_seg) => {
-	let title = ""
-	const order = title_number.sort((a, b) => a[1] - b[1])
-	const result = []
-	let start = 0
+    const order = title_number.sort((a, b) => a[1] - b[1]);
+    const result = [];
 
-	for (const [t, row] of order) {
-		console.log(t)
-		const index = row - 1
-		result.push(title + li.slice(start, index).join("\n"))
-		title = "# " + t + "\n"
-		start = index
-	}
+    let title,
+      row,
+      pre = 0;
+    for ([title, row] of order) {
+      console.log(title);
+      result.push([title, li.slice(pre, row)]);
+      pre = row;
+    }
 
-	if (start < li.length) {
-		li = li.slice(start)
-		const remain = li.join("\n")
-		if (remain.length > 6000) {
-			return result.concat(await remain_seg(li))
-		} else {
-			result.push(title + remain)
-		}
-	}
+    if (pre < li.length) {
+      li = li.slice(pre);
+      if (li.join("\n").length > 3000) {
+        return result.concat(await remain_seg(li));
+      } else {
+        result.at(-1)[1].push(...li);
+      }
+    }
 
-	return result
-}
-
-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),
-	)
-}
+    return result;
+  },
+  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, txt) => {
-	const li = txtLi(txt)
-	return partition(li, await seg(chat, li), repartition(chat, li.length))
-}
+  const li = txtLi(txt);
+  return partition(li, await seg(chat, li), repartition(chat, li.length));
+};

package/seg.js

@@ -20,15 +20,11 @@ export default async(chat, txt_li) => {
           type: TYPE.STRING
         },
         行: {
-          description: '该章首行行号',
+          description: '该章最后一行的行号',
           type: TYPE.INTEGER
-        },
-        文: {
-          description: '该章首行提问的原文',
-          type: TYPE.STRING
         }
       },
-      required: ['题', '行', '文']
+      required: ['题', '行']
     }
   }, '你是专业资深的秘书'));
   return split_li.map((i) => {