utilitas 1998.2.39 → 1998.2.41

package/lib/alan.mjs

@@ -101,7 +101,6 @@ const clients = {};
 const size8k = 7680 * 4320;
 const MAX_TOOL_RECURSION = 10;
 const LOG = { log: true };
-const OPENAI_BASE_URL = 'https://api.openai.com/v1';
 const sessionType = `${name.toUpperCase()}-SESSION`;
 const unifyProvider = options => unifyType(options?.provider, 'AI provider');
 const unifyEngine = options => unifyType(options?.engine, 'AI engine');
@@ -111,7 +110,6 @@ const renderText = (t, o) => _renderText(t, { extraCodeBlock: 0, ...o || {} });
 const log = (cnt, opt) => _log(cnt, import.meta.url, { time: 1, ...opt || {} });
 const CONTENT_IS_REQUIRED = 'Content is required.';
 const assertContent = content => assert(content.length, CONTENT_IS_REQUIRED);
-const packThink = thk => thk ? [`${THINK_STR}\n${thk}\n${THINK_END}`] : [];
 const countToolCalls = r => r?.split('\n').filter(x => x === TOOLS_STR).length;
 
 const DEFAULT_MODELS = {
@@ -663,17 +661,13 @@ const getInfoEnd = text => Math.max(...[THINK_END, TOOLS_END].map(x => {
 
 const packResp = async (resp, options) => {
     if (options?.raw) { return resp; }
-    let [
-        txt, audio, references, markdown, simpleText, referencesMarkdown, end,
-        json
-    ] = [
-            resp.text                                                           // ChatGPT / Claude / Gemini
-            || resp?.message?.content || '',                                    // Ollama @tudo: Need to be updated
-            resp?.audio?.data,                                                  // ChatGPT audio mode
-            resp?.references,                                                   // Gemini references
-            '', '', '', null,
-        ];
-    markdown = simpleText = txt;
+    let [txt, audio, references, simpleText, referencesMarkdown, end, json] = [
+        resp.text || '',                                                        // ChatGPT / Claude / Gemini / Ollama
+        resp?.audio?.data,                                                      // ChatGPT audio mode
+        resp?.references,                                                       // Gemini references
+        '', '', '', null,
+    ];
+    simpleText = txt;
     while ((end = getInfoEnd(simpleText))) {
         simpleText = simpleText.slice(end).trim();
         end = getInfoEnd(simpleText);
@@ -694,9 +688,7 @@ const packResp = async (resp, options) => {
     if (options?.simple && options?.audioMode) { return audio; }
     else if (options?.simple && options?.jsonMode) { return json; }
     else if (options?.simple) { return simpleText; }
-    else if (options?.jsonMode) {
-        markdown = `\`\`\`json\n${simpleText}\n\`\`\``;
-    }
+    else if (options?.jsonMode) { txt = `\`\`\`json\n${simpleText}\n\`\`\``; }
     // references debug codes:
     // references = {
     //     "segments": [
@@ -721,33 +713,30 @@ const packResp = async (resp, options) => {
     // };
     if (references?.segments?.length && references?.links?.length) {
         for (let i = references.segments.length - 1; i >= 0; i--) {
-            let idx = markdown.indexOf(references.segments[i].text);
+            let idx = txt.indexOf(references.segments[i].text);
             if (idx < 0) { continue; }
             idx += references.segments[i].text.length;
-            markdown = markdown.slice(0, idx)
+            txt = txt.slice(0, idx)
                 + references.segments[i].indices.map(y => ` (${y + 1})`).join('')
-                + markdown.slice(idx);
+                + txt.slice(idx);
         }
         referencesMarkdown = 'References:\n\n' + references.links.map(
             (x, i) => `${i + 1}. [${x.title}](${x.uri})`
         ).join('\n');
     }
-    markdown = markdown.split('\n');
-    for (let i in markdown) {
-        switch (markdown[i]) {
-            case THINK_STR: markdown[i] = MD_CODE + THINK; break;
-            case TOOLS_STR: markdown[i] = MD_CODE + TOOLS; break;
-            case THINK_END: case TOOLS_END: markdown[i] = MD_CODE;
+    txt = txt.split('\n');
+    for (let i in txt) {
+        switch (txt[i]) {
+            case THINK_STR: txt[i] = MD_CODE + THINK; break;
+            case TOOLS_STR: txt[i] = MD_CODE + TOOLS; break;
+            case THINK_END: case TOOLS_END: txt[i] = MD_CODE;
         }
     }
-    markdown = markdown.join('\n');
-    if (!options?.delta && !options?.processing) {
-        txt = txt.trim();
-        markdown = markdown.trim();
-    }
+    txt = txt.join('\n');
+    !options?.delta && !options?.processing && (txt = txt.trim());
     return {
         ...text(txt), ...options?.jsonMode ? { json } : {},
-        markdown, ...references ? { references } : {},
+        ...references ? { references } : {},
         ...referencesMarkdown ? { referencesMarkdown } : {},
         ...audio ? { audio, audioMimeType: options?.audioMimeType } : {},
         processing: options?.processing,

package/lib/manifest.mjs

@@ -1,7 +1,7 @@
 const manifest = {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.39",
+    "version": "1998.2.41",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "utilitas",
     "description": "Just another common utility for JavaScript.",
-    "version": "1998.2.39",
+    "version": "1998.2.41",
     "private": false,
     "homepage": "https://github.com/Leask/utilitas",
     "main": "index.mjs",